diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 4e33dcea1f..cd02863784 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -76,6 +76,13 @@ parameters:
     default: []
     description: List of extra hosts entries to be appended to /etc/hosts
     type: comma_delimited_list
+  UndercloudHostsEntries:
+    default: []
+    description: >
+      List of undercloud hosts entries to be appended to /etc/hosts. The
+      value is populated with the HEAT_HOSTS entries on the undercloud by
+      tripleoclient when running deploy.
+    type: comma_delimited_list
   EndpointMapOverride:
     default: {}
     description: Can be used to override the calcluated EndpointMap
@@ -785,6 +792,7 @@ resources:
       value:
         list_join:
         - "\n"
+        - {get_param: UndercloudHostsEntries}
         - - if:
             - add_vips_to_etc_hosts
             - {get_attr: [VipHosts, value]}