diff --git a/nodescraper/cli/cli.py b/nodescraper/cli/cli.py
index 32202583..0528b892 100644
--- a/nodescraper/cli/cli.py
+++ b/nodescraper/cli/cli.py
@@ -548,11 +548,12 @@ def main(arg_input: Optional[list[str]] = None):
         top_level_args, plugin_arg_map = process_args(arg_input, list(plugin_subparser_map.keys()))
 
         parsed_args = parser.parse_args(top_level_args)
+        system_info = get_system_info(parsed_args)
 
         if parsed_args.log_path and parsed_args.subcmd not in ["gen-plugin-config", "describe"]:
             log_path = os.path.join(
                 parsed_args.log_path,
-                f"scraper_logs_{datetime.datetime.now().strftime('%Y_%m_%d-%I_%M_%S_%p')}",
+                f"scraper_logs_{system_info.name}_{datetime.datetime.now().strftime('%Y_%m_%d-%I_%M_%S_%p')}",
             )
             os.makedirs(log_path)
         else:
@@ -591,7 +592,6 @@ def main(arg_input: Optional[list[str]] = None):
             plugin_subparser_map=plugin_subparser_map,
         )
 
-        system_info = get_system_info(parsed_args)
         log_system_info(log_path, system_info, logger)
     except Exception as e:
         parser.error(str(e))