diff --git a/etc/openstack_deploy/user_variables.yml b/etc/openstack_deploy/user_variables.yml
index deb9cfc802..9f6b12607a 100644
--- a/etc/openstack_deploy/user_variables.yml
+++ b/etc/openstack_deploy/user_variables.yml
@@ -44,10 +44,6 @@ glance_swift_store_endpoint_type: internalURL
 #glance_swift_store_container: "NAME_OF_SWIFT_CONTAINER"
 #glance_swift_store_region: "NAME_OF_REGION"
 
-## Swift
-# This will allow all users to create containers and upload to swift if set to True
-swift_allow_all_users: False
-
 ## Apache SSL Settings
 # These do not need to be configured unless you're creating certificates for
 # services running behind Apache (currently, Horizon and Keystone).
diff --git a/playbooks/roles/os_swift/defaults/main.yml b/playbooks/roles/os_swift/defaults/main.yml
index 7ec4328ee8..00ff1bc8b2 100644
--- a/playbooks/roles/os_swift/defaults/main.yml
+++ b/playbooks/roles/os_swift/defaults/main.yml
@@ -67,6 +67,8 @@ swift_default_host_zone: 0
 swift_default_host_region: 1
 swift_default_drive_weight: 100
 swift_allow_versions: True
+# This will allow all users to create containers and upload to swift if set to True
+swift_allow_all_users: False
 
 ## Swift Auth
 swift_service_admin_tenant_name: "service"