diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 7176adaad6..45b081ab85 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -20,6 +20,8 @@ transport_url = {{ rpc_transport_url }}
 
 region_name_for_services = {{ openstack_region_name }}
 
+server_keystone_endpoint_type = public
+
 {% if service_name == 'heat-api' %}
 [heat_api]
 bind_host = {{ api_interface_address }}
@@ -90,9 +92,6 @@ policy_file = {{ heat_policy_file }}
 [clients]
 endpoint_type = internalURL
 
-[clients_heat]
-endpoint_type = publicURL
-
 [oslo_middleware]
 enable_proxy_headers_parsing = True