diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index f2a59e3ee9..bc3fa85665 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -233,8 +233,14 @@ grafana_server_port: "3000"
 haproxy_stats_port: "1984"
 haproxy_monitor_port: "61313"
 
+heat_internal_fqdn: "{{ kolla_internal_fqdn }}"
+heat_external_fqdn: "{{ kolla_external_fqdn }}"
 heat_api_port: "8004"
+heat_api_listen_port: "{{ heat_api_port }}"
+heat_cfn_internal_fqdn: "{{ kolla_internal_fqdn }}"
+heat_cfn_external_fqdn: "{{ kolla_external_fqdn }}"
 heat_api_cfn_port: "8000"
+heat_api_cfn_listen_port: "{{ heat_api_cfn_port }}"
 
 horizon_port: "80"
 
diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml
index 078adf2beb..7bb7669a76 100644
--- a/ansible/roles/heat/defaults/main.yml
+++ b/ansible/roles/heat/defaults/main.yml
@@ -19,11 +19,13 @@ heat_services:
         mode: "http"
         external: false
         port: "{{ heat_api_port }}"
+        listen_port: "{{ heat_api_listen_port }}"
       heat_api_external:
         enabled: "{{ enable_heat }}"
         mode: "http"
         external: true
         port: "{{ heat_api_port }}"
+        listen_port: "{{ heat_api_listen_port }}"
   heat-api-cfn:
     container_name: heat_api_cfn
     group: heat-api-cfn
@@ -41,11 +43,13 @@ heat_services:
         mode: "http"
         external: false
         port: "{{ heat_api_cfn_port }}"
+        listen_port: "{{ heat_api_cfn_listen_port }}"
       heat_api_cfn_external:
         enabled: "{{ enable_heat }}"
         mode: "http"
         external: true
         port: "{{ heat_api_cfn_port }}"
+        listen_port: "{{ heat_api_cfn_listen_port }}"
   heat-engine:
     container_name: heat_engine
     group: heat-engine
@@ -92,12 +96,12 @@ heat_engine_dimensions: "{{ default_container_dimensions }}"
 ####################
 # OpenStack
 ####################
-heat_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
-heat_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
-heat_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
-heat_cfn_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ heat_api_cfn_port }}/v1"
-heat_cfn_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ heat_api_cfn_port }}/v1"
-heat_cfn_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}/v1"
+heat_admin_endpoint: "{{ admin_protocol }}://{{ heat_internal_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
+heat_internal_endpoint: "{{ internal_protocol }}://{{ heat_internal_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
+heat_public_endpoint: "{{ public_protocol }}://{{ heat_external_fqdn }}:{{ heat_api_port }}/v1/%(tenant_id)s"
+heat_cfn_admin_endpoint: "{{ admin_protocol }}://{{ heat_cfn_internal_fqdn }}:{{ heat_api_cfn_port }}/v1"
+heat_cfn_internal_endpoint: "{{ internal_protocol }}://{{ heat_cfn_internal_fqdn }}:{{ heat_api_cfn_port }}/v1"
+heat_cfn_public_endpoint: "{{ public_protocol }}://{{ heat_cfn_external_fqdn }}:{{ heat_api_cfn_port }}/v1"
 
 heat_logging_debug: "{{ openstack_logging_debug }}"
 
diff --git a/ansible/roles/heat/tasks/precheck.yml b/ansible/roles/heat/tasks/precheck.yml
index 6c29daaa0e..4454fbd612 100644
--- a/ansible/roles/heat/tasks/precheck.yml
+++ b/ansible/roles/heat/tasks/precheck.yml
@@ -9,7 +9,7 @@
 - name: Checking free port for Heat API
   wait_for:
     host: "{{ api_interface_address }}"
-    port: "{{ heat_api_port }}"
+    port: "{{ heat_api_listen_port }}"
     connect_timeout: 1
     timeout: 1
     state: stopped
@@ -20,7 +20,7 @@
 - name: Checking free port for Heat API CFN
   wait_for:
     host: "{{ api_interface_address }}"
-    port: "{{ heat_api_cfn_port }}"
+    port: "{{ heat_api_cfn_listen_port }}"
     connect_timeout: 1
     timeout: 1
     state: stopped
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b33dacb0bb..8278cf44d3 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -3,9 +3,9 @@ debug = {{ heat_logging_debug }}
 
 log_dir = /var/log/kolla/heat
 
-heat_watch_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}
-heat_metadata_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}
-heat_waitcondition_server_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ heat_api_cfn_port }}/v1/waitcondition
+heat_watch_server_url = {{ public_protocol }}://{{ heat_cfn_external_fqdn }}:{{ heat_api_cfn_port }}
+heat_metadata_server_url = {{ public_protocol }}://{{ heat_cfn_external_fqdn }}:{{ heat_api_cfn_port }}
+heat_waitcondition_server_url = {{ public_protocol }}://{{ heat_cfn_external_fqdn }}:{{ heat_api_cfn_port }}/v1/waitcondition
 
 heat_stack_user_role = {{ heat_stack_user_role }}
 
@@ -26,14 +26,14 @@ region_name_for_services = {{ openstack_region_name }}
 {% if service_name == 'heat-api' %}
 [heat_api]
 bind_host = {{ api_interface_address }}
-bind_port = {{ heat_api_port }}
+bind_port = {{ heat_api_listen_port }}
 workers = {{ openstack_service_workers }}
 {% endif %}
 
 {% if service_name == 'heat-api-cfn' %}
 [heat_api_cfn]
 bind_host = {{ api_interface_address }}
-bind_port = {{ heat_api_cfn_port }}
+bind_port = {{ heat_api_cfn_listen_port }}
 workers = {{ openstack_service_workers }}
 {% endif %}