diff --git a/templates/icehouse/heat.conf b/templates/icehouse/heat.conf
index 99ce0b4..59380b8 100644
--- a/templates/icehouse/heat.conf
+++ b/templates/icehouse/heat.conf
@@ -89,4 +89,9 @@ workers = {{ workers }}
 {% if use_internal_endpoints -%}
 [clients]
 endpoint_type = internalURL
+
+[heat_clients]
+# See LP 1770144
+endpoint_type = publicURL
+
 {%- endif %}
diff --git a/templates/mitaka/heat.conf b/templates/mitaka/heat.conf
index d8c1d2d..43518f9 100644
--- a/templates/mitaka/heat.conf
+++ b/templates/mitaka/heat.conf
@@ -69,4 +69,9 @@ workers = {{ workers }}
 {% if use_internal_endpoints -%}
 [clients]
 endpoint_type = internalURL
+
+[heat_clients]
+# See LP 1770144
+endpoint_type = publicURL
+
 {%- endif %}