diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 057d1fe9..0bfdb6b2 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -2,4 +2,5 @@
 scripts setup_nova_compute.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 9b400fcd..5988f705 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -10,4 +10,6 @@ scripts setup_cinder_volumes.sh
 scripts setup_horizon.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"
+boot
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index 8c71787d..4d7a25a4 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -1,4 +1,5 @@
 # Scripts for network node
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "pre-installed"
diff --git a/labs/config/scripts.nodeinit_osbash b/labs/config/scripts.nodeinit_osbash
index 42e24c3a..6f811d50 100644
--- a/labs/config/scripts.nodeinit_osbash
+++ b/labs/config/scripts.nodeinit_osbash
@@ -4,4 +4,5 @@ osbash enable_vagrant_ssh_keys.sh
 #osbash wait_debug.sh
 scripts shutdown.sh
 boot
+wait_for_shutdown
 snapshot "Network configured."
diff --git a/labs/lib/osbash/functions.host b/labs/lib/osbash/functions.host
index fc896083..2b39ed24 100644
--- a/labs/lib/osbash/functions.host
+++ b/labs/lib/osbash/functions.host
@@ -279,6 +279,9 @@ function autostart_from_config {
             # Format: snapshot "Description for snapshot"
             echo >&2 vm_snapshot "$NODE_NAME" "$field_2"
             vm_snapshot "$NODE_NAME" "$field_2"
+        elif [ "$field_1" == "wait_for_shutdown" ]; then
+            echo >&2 vm_wait_for_shutdown "$NODE_NAME"
+            vm_wait_for_shutdown "$NODE_NAME"
         else
             # Queue a script for autostart
             # Format: <dircode> <script_name>
diff --git a/labs/lib/osbash/virtualbox.install_node b/labs/lib/osbash/virtualbox.install_node
index b401de9c..8326eba1 100644
--- a/labs/lib/osbash/virtualbox.install_node
+++ b/labs/lib/osbash/virtualbox.install_node
@@ -33,7 +33,6 @@ function _vbox_boot_with_autostart {
 
     wait_for_autofiles
     echo >&2 "VM \"$VM\": autostart files executed"
-    vm_wait_for_shutdown "$VM"
 }
 
 function vm_build_node {