diff --git a/scripts/cloudserver-aio.sh b/scripts/cloudserver-aio.sh
index d304b5f1bd..8cb921d95a 100755
--- a/scripts/cloudserver-aio.sh
+++ b/scripts/cloudserver-aio.sh
@@ -431,17 +431,15 @@ pushd /opt/ansible-lxc-rpc/rpc_deployment
   # Install all of the infra bits
   install_bits infrastructure/infrastructure-setup.yml
   # install all of the Openstack Bits
-  install_bits openstack/openstack-common.yml
-  install_bits openstack/keystone.yml
-  install_bits openstack/keystone-add-all-services.yml
+  install_bits openstack/keystone-all.yml
   install_bits openstack/glance-all.yml
   install_bits openstack/heat-all.yml
   install_bits openstack/nova-all.yml
   install_bits openstack/neutron-all.yml
   install_bits openstack/cinder-all.yml
   install_bits openstack/horizon-all.yml
-  install_bits openstack/utility.yml
-  install_bits openstack/rpc-support.yml
+  install_bits openstack/utility-all.yml
+  install_bits openstack/rpc-support-all.yml
   # Stop rsyslog container(s)
   for i in $(lxc-ls | grep "rsyslog"); do 
       lxc-stop -k -n $i; lxc-start -d -n $i
diff --git a/scripts/rpc9.0.0-aio-heat-template.yml b/scripts/rpc-aio-heat-template.yml
similarity index 100%
rename from scripts/rpc9.0.0-aio-heat-template.yml
rename to scripts/rpc-aio-heat-template.yml
diff --git a/scripts/rpc9.0.0-aio-rax-heat-template.yml b/scripts/rpc-aio-rax-heat-template.yml
similarity index 100%
rename from scripts/rpc9.0.0-aio-rax-heat-template.yml
rename to scripts/rpc-aio-rax-heat-template.yml