diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b9389e445a..b3f494b10c 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -89,3 +89,8 @@ driver = noop
 
 [clients]
 endpoint_type = internalURL
+
+{% if public_protocol != internal_protocol and kolla_external_fqdn != kolla_internal_fqdn %}
+[oslo_middleware]
+enable_proxy_headers_parsing = True
+{% endif %}