diff --git a/etc/openstack_deploy/user_secrets.yml b/etc/openstack_deploy/user_secrets.yml
index 0cf4fc7f5b..35b816c828 100644
--- a/etc/openstack_deploy/user_secrets.yml
+++ b/etc/openstack_deploy/user_secrets.yml
@@ -80,3 +80,6 @@ kibana_password:
 swift_service_password:
 swift_container_mysql_password:
 swift_dispersion_password:
+### Once the swift cluster has been setup DO NOT change these hash values!
+swift_hash_path_suffix:
+swift_hash_path_prefix:
diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml
index 557d3dc4ed..e174045155 100644
--- a/etc/openstack_deploy/user_variables.yml
+++ b/etc/openstack_deploy/user_variables.yml
@@ -36,8 +36,5 @@ glance_swift_store_endpoint_type: internalURL
 
 
 ## Swift
-# Once the swift cluster has been setup DO NOT change these hash values!
-swift_hash_path_suffix:
-swift_hash_path_prefix:
 # This will allow all users to create containers and upload to swift if set to True
 swift_allow_all_users: False