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 f52384563..bb25465ca 100644
--- a/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_hosts_entries/molecule/default/molecule.yml
@@ -57,7 +57,7 @@ provisioner:
             InternalApi:
               name_lower: internal_api
         children:
-          overcloud:
+          allovercloud:
             hosts:
               centos8:
                 hostname_resolve_network: ctlplane
diff --git a/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml b/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
index c00b9a71b..d2fc90852 100644
--- a/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_hosts_entries/tasks/main.yml
@@ -31,7 +31,7 @@
   run_once: true
   set_fact:
     tripleo_hosts_entries_block: |
-      {% for host in groups['overcloud'] -%}
+      {% for host in groups['allovercloud'] -%}
       {{ hostvars[host][hostvars[host]['hostname_resolve_network'] ~ '_ip'] ~ ' ' ~
          host ~ '.' ~ cloud_domain ~ ' ' ~ host }}
       {# ## NOTE(hjensas): The Undercloud Minion has no networks, need to check for that here. -#}
diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
index e6e0e8066..284f0dcdd 100644
--- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/default/molecule.yml
@@ -34,7 +34,7 @@ provisioner:
     hosts:
       all:
         children:
-          overcloud:
+          allovercloud:
             hosts:
               centos8:
                 ansible_ssh_host_key_rsa_public: AAAATEST
diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
index 8a7d6f39f..d14effcb0 100644
--- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/molecule/no_networks/molecule.yml
@@ -34,7 +34,7 @@ provisioner:
     hosts:
       all:
         children:
-          overcloud:
+          allovercloud:
             hosts:
               centos8:
                 ansible_ssh_host_key_rsa_public: AAAATEST
diff --git a/tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml b/tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml
index ee2b496b3..79de25b35 100644
--- a/tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_ssh_known_hosts/tasks/main.yml
@@ -47,7 +47,7 @@
       run_once: true
       set_fact:
         ssh_known_hosts_lines: |-
-          {% for host in groups['overcloud'] | intersect(play_hosts) %}
+          {% for host in groups['allovercloud'] | intersect(play_hosts) %}
           {%   set hostdata = hostvars[host] %}
           {%   if 'ansible_ssh_host_key_rsa_public' in hostdata %}
           {%     set entries = [] %}