diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 033e45a2eb..6f1a63067b 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -46,7 +46,7 @@ connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_passw
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index b853411d79..6ee5c58fda 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -22,7 +22,7 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2
index be36a7851c..64cd07b8bb 100644
--- a/ansible/roles/glance/templates/glance-registry.conf.j2
+++ b/ansible/roles/glance/templates/glance-registry.conf.j2
@@ -16,7 +16,7 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 522fe9b95a..f8ac97197c 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -38,7 +38,7 @@ connection = mysql+pymysql://{{ heat_database_user }}:{{ heat_database_password
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index eebc1650e3..c003cafe65 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -21,7 +21,7 @@ connection = mysql+pymysql://{{ ironic_database_user }}:{{ ironic_database_passw
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index d3beeab5e8..710311440d 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -20,7 +20,7 @@ region_name = {{ openstack_region_name }}
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
@@ -30,7 +30,7 @@ password = {{ magnum_keystone_password }}
 [trustee]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2
index 31f432ebc9..7617a068f8 100644
--- a/ansible/roles/mistral/templates/mistral.conf.j2
+++ b/ansible/roles/mistral/templates/mistral.conf.j2
@@ -18,7 +18,7 @@ connection = mysql+pymysql://{{ mistral_database_user }}:{{ mistral_database_pas
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2
index fe45bb0895..685831749f 100644
--- a/ansible/roles/murano/templates/murano.conf.j2
+++ b/ansible/roles/murano/templates/murano.conf.j2
@@ -18,7 +18,7 @@ connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_passw
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 91e93cca63..3e0cd49df1 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -31,7 +31,7 @@ service_plugins = router
 
 [nova]
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 region_name = {{ openstack_region_name }}
@@ -57,7 +57,7 @@ connection = mysql+pymysql://{{ neutron_database_user }}:{{ neutron_database_pas
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 9aad3ef1a0..af0d2f77d0 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -117,7 +117,7 @@ metadata_proxy_shared_secret = {{ metadata_secret }}
 service_metadata_proxy = true
 
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_name = default
 user_domain_id = default
 project_name = service
@@ -130,7 +130,7 @@ connection = mysql+pymysql://{{ nova_database_user }}:{{ nova_database_password
 [keystone_authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service
diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2
index 59290860e8..cea708a953 100644
--- a/ansible/roles/swift/templates/proxy-server.conf.j2
+++ b/ansible/roles/swift/templates/proxy-server.conf.j2
@@ -31,7 +31,7 @@ use = egg:swift#proxy_logging
 paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
 auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
-auth_plugin = password
+auth_type = password
 project_domain_id = default
 user_domain_id = default
 project_name = service