diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index ab905a65..bb14f52f 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -7,5 +7,6 @@ osbash enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle "network_configured"
 scripts setup_nova_compute.sh
 scripts setup_neutron_compute.sh
+scripts setup_cinder_volumes.sh
 cmd snapshot_cycle "pre-installed"
 cmd boot
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 3418ceea..b48dec27 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -17,7 +17,6 @@ cmd snapshot_cycle "nova-controller_installed"
 scripts setup_neutron_controller.sh
 cmd snapshot_cycle "neutron-controller_installed"
 scripts setup_cinder_controller.sh
-scripts setup_cinder_volumes.sh
 cmd snapshot_cycle "cinder_installed"
 scripts setup_horizon.sh
 cmd snapshot_cycle "horizon_installed"