diff --git a/etc/openstack_deploy/conf.d/swift.yml b/etc/openstack_deploy/conf.d/swift.yml.aio
similarity index 100%
rename from etc/openstack_deploy/conf.d/swift.yml
rename to etc/openstack_deploy/conf.d/swift.yml.aio
diff --git a/etc/openstack_deploy/openstack_user_config.yml b/etc/openstack_deploy/openstack_user_config.yml.aio
similarity index 100%
rename from etc/openstack_deploy/openstack_user_config.yml
rename to etc/openstack_deploy/openstack_user_config.yml.aio
diff --git a/scripts/bootstrap-aio.sh b/scripts/bootstrap-aio.sh
index ac427aa7cc..fd53097009 100755
--- a/scripts/bootstrap-aio.sh
+++ b/scripts/bootstrap-aio.sh
@@ -241,8 +241,11 @@ if [ -d "/etc/openstack_deploy" ];then
   rm -rf "/etc/openstack_deploy"
 fi
 
-# Copy the base etc files
+# Move the *.aio files into place for use within the AIO build.
 cp -R etc/openstack_deploy /etc/
+for i in $(find /etc/openstack_deploy/ -type f -name '*.aio');do
+  rename 's/\.aio$//g' $i
+done
 
 # Ensure the conf.d directory exists
 if [ ! -d "/etc/openstack_deploy/conf.d" ];then