diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index a4c631161..c177dd2a0 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -448,9 +448,7 @@ class { '::heat':
   debug                        => hiera('debug'),
   keystone_ec2_uri             => join([hiera('keystone_auth_uri'), '/ec2tokens']),
   enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
-}
-heat_config {
-  'clients/endpoint_type': value => 'internal',
+  heat_clients_endpoint_type   => hiera('heat_clients_endpoint_type', 'internal'),
 }
 include ::heat::api
 include ::heat::wsgi::apache_api
diff --git a/releasenotes/notes/configurable-clients-endpoint_type-fc658f7ae935133f.yaml b/releasenotes/notes/configurable-clients-endpoint_type-fc658f7ae935133f.yaml
new file mode 100644
index 000000000..dc29d8e55
--- /dev/null
+++ b/releasenotes/notes/configurable-clients-endpoint_type-fc658f7ae935133f.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    In /etc/heat/heat.conf, [clients]/endpoint_type was configured to use the
+    internal endpoints and this was hardcoded in puppet-stack-config.pp so
+    there was no way to change it. It's now configurable via the hiera key
+    heat_clients_endpoint_type.