diff --git a/defaults/main.yml b/defaults/main.yml
index 3728f82e..9361f206 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -85,6 +85,7 @@ swift_service_name: swift
 swift_service_user_name: swift
 swift_service_project_name: service
 swift_service_project_domain_id: "default"
+swift_service_project_domain_name: "Default"
 swift_service_user_domain_id: "default"
 swift_service_role_name: "admin"
 swift_service_type: object-store
@@ -109,8 +110,9 @@ statsd_metric_prefix:
 ## Keystone authentication middleware
 swift_keystone_auth_plugin: "password"
 
-## Swift default variables
 swift_dispersion_user: dispersion
+swift_dispersion_user_domain_name: "Default"
+
 swift_operator_role: swiftoperator
 swift_allow_versions: True
 # This will allow all users to create containers and upload to swift if set to True
diff --git a/templates/swift-dispersion.conf.j2 b/templates/swift-dispersion.conf.j2
index 2469d894..ae969714 100644
--- a/templates/swift-dispersion.conf.j2
+++ b/templates/swift-dispersion.conf.j2
@@ -2,8 +2,10 @@
 
 [dispersion]
 auth_url = {{ keystone_service_internalurl }}
-auth_user = {{ swift_service_project_name }}:{{ swift_dispersion_user }}
+auth_user = {{ swift_dispersion_user }}
 auth_key = {{ swift_dispersion_password }}
-auth_version = 2.0
-keystone_api_insecure = {{ keystone_service_internaluri_insecure | bool }}
+auth_version = 3.0
+user_domain_name = {{ swift_dispersion_user_domain_name }}
+project_domain_name = {{ swift_service_project_domain_name }}
+project_name = {{ swift_service_project_name }}
 endpoint_type = internalURL