diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 9d891758e5..8615156d7c 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -9,6 +9,7 @@ stack_user_domain_name = heat_user_domain
 
 rpc_backend = rabbit
 notification_driver = noop
+deferred_auth_method = password
 
 [oslo_messaging_rabbit]
 rabbit_host = {{ kolla_internal_address }}
@@ -43,3 +44,6 @@ password = {{ heat_keystone_password }}
 
 [ec2authtoken]
 auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
+
+[clients_keystone]
+auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}