diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 006542b7a3..006ccf2863 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -93,3 +93,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 %}