diff --git a/controller.py b/controller.py
index d817990..d6e4bef 100755
--- a/controller.py
+++ b/controller.py
@@ -252,6 +252,7 @@ def controller(
     queuedepth,
     compressionlevel,
     qemu_output,
+    goldenrun_only,
     goldenrun=True,
     logger=hdf5collector,
     qemu_pre=None,
@@ -290,6 +291,10 @@ def controller(
             (config_qemu["max_instruction_count"], goldenrun_data, faultlist),
             lzma.open("bkup_goldenrun_results.xz", "wb"),
         )
+
+        clogger.info(f"Got {len(faultlist)} fault entries")
+        if goldenrun_only:
+            return config_qemu
     else:
         (
             config_qemu["max_instruction_count"],
@@ -514,6 +519,12 @@ def get_argument_parser():
         action="store_true",
         required=False,
     )
+    parser.add_argument(
+        "--goldenrun-only",
+        help="Only run goldenrun to create the goldenrun backup file",
+        action="store_true",
+        required=False,
+    )
     return parser
 
 
@@ -550,6 +561,12 @@ def process_arguments(args):
         )
         exit(1)
 
+    if args.goldenrun_only:
+        parguments["goldenrun_only"] = True
+        parguments["goldenrun"] = True
+    else:
+        parguments["goldenrun_only"] = False
+
     qemu_conf = json.load(args.qemu)
     args.qemu.close()
     print(qemu_conf)
@@ -658,6 +675,7 @@ def init_logging():
         parguments["queuedepth"],  # queuedepth
         parguments["compressionlevel"],  # compressionlevel
         args.debug,  # qemu_output
+        parguments["goldenrun_only"],
         parguments["goldenrun"],  # goldenrun
         hdf5collector,  # logger
         None,  # qemu_pre