diff --git a/main.pm b/main.pm
index 8b36feb7..b5548b82 100644
--- a/main.pm
+++ b/main.pm
@@ -343,7 +343,7 @@ sub load_postinstall_tests() {
     }
 
     # we should shut down before uploading disk images
-    if (get_var("STORE_HDD_1") || get_var("PUBLISH_HDD_1")) {
+    if (get_var("STORE_HDD_1") || get_var("STORE_HDD_2") || get_var("PUBLISH_HDD_1")) {
         autotest::loadtest "tests/_console_shutdown.pm";
     }
     
diff --git a/templates.fif.json b/templates.fif.json
index 4705099d..b69e83a8 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -874,11 +874,10 @@
                 "fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 12
             },
             "settings": {
-                "HDD_1": "%HDD_2%",
                 "IMAGE_DEPLOY": "1",
                 "INSTALL_NO_USER": "1",
-                "NUMDISKS": "1",
-                "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
+                "NUMDISKS": "2",
+                "STORE_HDD_2": "disk_%FLAVOR%_%MACHINE%.qcow2"
             }
         },
         "install_asian_language": {