diff --git a/bin/omarchy-iso-test b/bin/omarchy-iso-test
index f41cbc9..80cc7f5 100755
--- a/bin/omarchy-iso-test
+++ b/bin/omarchy-iso-test
@@ -872,7 +872,7 @@ EOF
   capture_console "success-first-boot-05-bootstrap-command"
   press ret
 
-  wait_for_ssh 180 "failure-first-boot-ssh-timeout"
+  wait_for_ssh 360 "failure-first-boot-ssh-timeout"
   capture_console "success-first-boot-06-bootstrap-complete"
 
   kill "$HTTP_PID" 2>/dev/null || true
diff --git a/configs/airootfs/root/configurator b/configs/airootfs/root/configurator
index b4286b9..aac5309 100644
--- a/configs/airootfs/root/configurator
+++ b/configs/airootfs/root/configurator
@@ -908,7 +908,13 @@ select_installation() {
       full_disk_only=false
     fi
 
-    install_mode_form
+    # With no free-space option to offer, a full-disk install is the only
+    # mode, so skip the picker and go straight to the overwrite confirm.
+    if $full_disk_only; then
+      install_mode="Full disk install"
+    else
+      install_mode_form
+    fi
 
     case "$install_mode" in
       "Full disk install")
@@ -916,6 +922,9 @@ select_installation() {
           install_target="full_disk"
           return 0
         fi
+        # When the picker was skipped, declining the overwrite means the user
+        # wants a different disk.
+        $full_disk_only && disk_form
         ;;
       "Free space install"*)
         if run_partition_decide; then