diff --git a/labs/config/scripts.compute b/labs/config/scripts.compute
index 519fcfc3..3fcf3857 100644
--- a/labs/config/scripts.compute
+++ b/labs/config/scripts.compute
@@ -3,10 +3,10 @@ cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle compute_node_init
-cmd queue setup_nova_compute.sh
+cmd queue ubuntu/setup_nova_compute.sh
 cmd snapshot_cycle nova-compute_installed
-cmd queue setup_neutron_compute.sh
-cmd queue setup_cinder_volumes.sh
+cmd queue ubuntu/setup_neutron_compute.sh
+cmd queue ubuntu/setup_cinder_volumes.sh
 cmd snapshot_cycle compute_node_installed
 # Take snapshot of changes on controller VM, too
 cmd queue shutdown_controller.sh
diff --git a/labs/config/scripts.controller b/labs/config/scripts.controller
index 6f8abf8f..4492daff 100644
--- a/labs/config/scripts.controller
+++ b/labs/config/scripts.controller
@@ -3,20 +3,20 @@ cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle controller_node_init
-cmd queue apt_install_mysql.sh
-cmd queue install_rabbitmq.sh
+cmd queue ubuntu/apt_install_mysql.sh
+cmd queue ubuntu/install_rabbitmq.sh
 cmd snapshot_cycle pre-openstack_installed
-cmd queue setup_keystone.sh
+cmd queue ubuntu/setup_keystone.sh
 cmd snapshot_cycle keystone_installed
-cmd queue setup_glance.sh
+cmd queue ubuntu/setup_glance.sh
 cmd snapshot_cycle glance_installed
-cmd queue setup_nova_controller.sh
+cmd queue ubuntu/setup_nova_controller.sh
 cmd snapshot_cycle nova-controller_installed
-cmd queue setup_neutron_controller.sh
+cmd queue ubuntu/setup_neutron_controller.sh
 cmd snapshot_cycle neutron-controller_installed
-cmd queue setup_cinder_controller.sh
+cmd queue ubuntu/setup_cinder_controller.sh
 cmd snapshot_cycle cinder_installed
-cmd queue setup_horizon.sh
+cmd queue ubuntu/setup_horizon.sh
 cmd snapshot_cycle horizon_installed
 cmd queue config_external_network.sh
 cmd queue config_tenant_network.sh
diff --git a/labs/config/scripts.network b/labs/config/scripts.network
index b495692a..de0c4eda 100644
--- a/labs/config/scripts.network
+++ b/labs/config/scripts.network
@@ -3,9 +3,9 @@ cmd init_node
 cmd queue etc_hosts.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
 cmd snapshot_cycle network_node_init
-cmd queue setup_neutron_network.sh
+cmd queue ubuntu/setup_neutron_network.sh
 cmd snapshot_cycle neutron_configured
-cmd queue setup_lbaas_network.sh
+cmd queue ubuntu/setup_lbaas_network.sh
 cmd snapshot_cycle network_node_installed
 # Take snapshot of changes on controller VM, too
 cmd queue shutdown_controller.sh
diff --git a/labs/config/scripts.ubuntu_base b/labs/config/scripts.ubuntu_base
index 9548f9d3..c80bea42 100644
--- a/labs/config/scripts.ubuntu_base
+++ b/labs/config/scripts.ubuntu_base
@@ -1,5 +1,5 @@
 # Scripts for Ubuntu installations
-cmd queue apt_init.sh
-cmd queue apt_upgrade.sh
-cmd queue apt_pre-download.sh
+cmd queue ubuntu/apt_init.sh
+cmd queue ubuntu/apt_upgrade.sh
+cmd queue ubuntu/apt_pre-download.sh
 cmd queue osbash/enable_vagrant_ssh_keys.sh
diff --git a/labs/scripts/apt_init.sh b/labs/scripts/ubuntu/apt_init.sh
similarity index 100%
rename from labs/scripts/apt_init.sh
rename to labs/scripts/ubuntu/apt_init.sh
diff --git a/labs/scripts/apt_install_mysql.sh b/labs/scripts/ubuntu/apt_install_mysql.sh
similarity index 100%
rename from labs/scripts/apt_install_mysql.sh
rename to labs/scripts/ubuntu/apt_install_mysql.sh
diff --git a/labs/scripts/apt_pre-download.sh b/labs/scripts/ubuntu/apt_pre-download.sh
similarity index 100%
rename from labs/scripts/apt_pre-download.sh
rename to labs/scripts/ubuntu/apt_pre-download.sh
diff --git a/labs/scripts/apt_upgrade.sh b/labs/scripts/ubuntu/apt_upgrade.sh
similarity index 100%
rename from labs/scripts/apt_upgrade.sh
rename to labs/scripts/ubuntu/apt_upgrade.sh
diff --git a/labs/scripts/install_rabbitmq.sh b/labs/scripts/ubuntu/install_rabbitmq.sh
similarity index 100%
rename from labs/scripts/install_rabbitmq.sh
rename to labs/scripts/ubuntu/install_rabbitmq.sh
diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/ubuntu/setup_cinder_controller.sh
similarity index 100%
rename from labs/scripts/setup_cinder_controller.sh
rename to labs/scripts/ubuntu/setup_cinder_controller.sh
diff --git a/labs/scripts/setup_cinder_volumes.sh b/labs/scripts/ubuntu/setup_cinder_volumes.sh
similarity index 100%
rename from labs/scripts/setup_cinder_volumes.sh
rename to labs/scripts/ubuntu/setup_cinder_volumes.sh
diff --git a/labs/scripts/setup_glance.sh b/labs/scripts/ubuntu/setup_glance.sh
similarity index 100%
rename from labs/scripts/setup_glance.sh
rename to labs/scripts/ubuntu/setup_glance.sh
diff --git a/labs/scripts/setup_horizon.sh b/labs/scripts/ubuntu/setup_horizon.sh
similarity index 100%
rename from labs/scripts/setup_horizon.sh
rename to labs/scripts/ubuntu/setup_horizon.sh
diff --git a/labs/scripts/setup_keystone.sh b/labs/scripts/ubuntu/setup_keystone.sh
similarity index 100%
rename from labs/scripts/setup_keystone.sh
rename to labs/scripts/ubuntu/setup_keystone.sh
diff --git a/labs/scripts/setup_lbaas_network.sh b/labs/scripts/ubuntu/setup_lbaas_network.sh
similarity index 100%
rename from labs/scripts/setup_lbaas_network.sh
rename to labs/scripts/ubuntu/setup_lbaas_network.sh
diff --git a/labs/scripts/setup_neutron_compute.sh b/labs/scripts/ubuntu/setup_neutron_compute.sh
similarity index 100%
rename from labs/scripts/setup_neutron_compute.sh
rename to labs/scripts/ubuntu/setup_neutron_compute.sh
diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/ubuntu/setup_neutron_controller.sh
similarity index 100%
rename from labs/scripts/setup_neutron_controller.sh
rename to labs/scripts/ubuntu/setup_neutron_controller.sh
diff --git a/labs/scripts/setup_neutron_network.sh b/labs/scripts/ubuntu/setup_neutron_network.sh
similarity index 100%
rename from labs/scripts/setup_neutron_network.sh
rename to labs/scripts/ubuntu/setup_neutron_network.sh
diff --git a/labs/scripts/setup_nova_compute.sh b/labs/scripts/ubuntu/setup_nova_compute.sh
similarity index 100%
rename from labs/scripts/setup_nova_compute.sh
rename to labs/scripts/ubuntu/setup_nova_compute.sh
diff --git a/labs/scripts/setup_nova_controller.sh b/labs/scripts/ubuntu/setup_nova_controller.sh
similarity index 100%
rename from labs/scripts/setup_nova_controller.sh
rename to labs/scripts/ubuntu/setup_nova_controller.sh