diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
index d83ebe958..ac68c9e2a 100644
--- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
@@ -41,6 +41,8 @@ provisioner:
           tripleo_hosts_entries_undercloud_hosts_entries: []
           tripleo_hosts_entries_extra_hosts_entries: []
           tripleo_hosts_entries_vip_hosts_entries: []
+          tripleo_stack_name: overcloud
+          plan: overcloud
           cloud_domain: localdomain
           enabled_networks:
             - ctlplane
diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
index e0e4a8f5a..d8bc5cab9 100644
--- a/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
@@ -85,6 +85,9 @@
           tripleo_hosts_entries_extra_hosts_entries | default([]) %}
       {{ host }}
       {% endfor %}
+    marker: "# {mark}"
+    marker_begin: "START_HOST_ENTRIES_FOR_STACK: {{ tripleo_stack_name | default(plan) }}"
+    marker_end: "END_HOST_ENTRIES_FOR_STACK: {{ tripleo_stack_name | default(plan) }}"
   register: tripleo_hosts_entries_new_entries
   tags:
     - tripleo_hosts_entries