diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index 345e76cd..0fe143ac 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -61,6 +61,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -71,6 +72,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -112,6 +114,7 @@
             "flavor": "updates-server",
             "settings": {
                 "+HDD_1": "disk_f%VERSION%_server_3_%ARCH%.qcow2",
+                "NUMDISKS": "2",
                 "RETRY": "1"
             },
             "version": "*"
@@ -125,6 +128,7 @@
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_update_ostree",
                 "HDDSIZEGB": "15",
+                "NUMDISKS": "2",
                 "PACKAGE_SET": "default",
                 "RETRY": "1",
                 "SUBVARIANT": "Silverblue"
diff --git a/tests/_console_shutdown.pm b/tests/_console_shutdown.pm
index 38d0cc6b..c2dc3fc3 100644
--- a/tests/_console_shutdown.pm
+++ b/tests/_console_shutdown.pm
@@ -15,6 +15,10 @@ sub run {
     # tests that need to edit boot params will see it. Don't use
     # assert_script_run as this will fail when it's not set
     script_run("grub2-editenv - unset menu_auto_hide", 0);
+    # drop the update_repo mount definition on update tests, as
+    # child tests won't have the same disk image attached as HDD_2
+    # so won't have this there to mount
+    script_run("sed -i '/update_repo/d' /etc/fstab") if (get_var("ADVISORY_OR_TASK"));
     script_run("poweroff", 0);
     assert_shutdown 180;
 }