diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 60cc9f65..1988ea30 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -8,4 +8,9 @@ cmd snapshot_cycle nova-compute_installed
 cmd queue setup_neutron_compute.sh
 cmd queue setup_cinder_volumes.sh
 cmd snapshot_cycle compute_node_installed
+# Take snapshot of changes on controller VM, too
+cmd queue shutdown_controller.sh
 cmd boot
+cmd wait_for_shutdown -n controller
+cmd snapshot -n controller compute_node_installed
+cmd boot -n controller
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index bce8ac36..e4c73ce4 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -5,4 +5,9 @@ cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle network_configured
 cmd queue setup_neutron_network.sh
 cmd snapshot_cycle network_node_installed
+# Take snapshot of changes on controller VM, too
+cmd queue shutdown_controller.sh
 cmd boot
+cmd wait_for_shutdown -n controller
+cmd snapshot -n controller network_node_installed
+cmd boot -n controller