diff --git a/ansible/apt.yml b/ansible/apt.yml
index 907e7ec62c83740d4f5d9c3b1eff560f9f13fe39..08146bce6a7613cb735fc0f8bb53953b307b05c5 100644
--- a/ansible/apt.yml
+++ b/ansible/apt.yml
@@ -1,6 +1,6 @@
 ---
 - name: Ensure APT is configured
-  hosts: seed-hypervisor:seed:overcloud
+  hosts: seed-hypervisor:seed:overcloud:infra-vms
   vars:
     ansible_python_interpreter: /usr/bin/python3
   tags:
diff --git a/ansible/kayobe-ansible-user.yml b/ansible/kayobe-ansible-user.yml
index cd1e8637be53793f410fc55f633e4ad54064ff31..6d081baf6652b641cd8930e9560aa9c8503ece67 100644
--- a/ansible/kayobe-ansible-user.yml
+++ b/ansible/kayobe-ansible-user.yml
@@ -87,7 +87,7 @@
       become: True
 
 - name: Verify that the Kayobe Ansible user account is accessible
-  hosts: seed-hypervisor:seed:overcloud
+  hosts: seed-hypervisor:seed:overcloud:infra-vms
   gather_facts: false
   tags:
     - kayobe-ansible-user
diff --git a/ansible/network-connectivity.yml b/ansible/network-connectivity.yml
index cf7a4043d56a5f08c932bb35da8b9c07d944c39f..ccd95230e5b601093a4f9dd8bd7293f869a2be03 100644
--- a/ansible/network-connectivity.yml
+++ b/ansible/network-connectivity.yml
@@ -1,6 +1,6 @@
 ---
 - name: Check network connectivity between hosts
-  hosts: seed:seed-hypervisor:overcloud
+  hosts: seed:seed-hypervisor:overcloud:infra-vms
   vars:
     # Set this to an external IP address to check.
     nc_external_ip: 8.8.8.8
diff --git a/ansible/wipe-disks.yml b/ansible/wipe-disks.yml
index 7aec95078b260f14b6d9208d09dd6e75d0abdb63..8ade2328e4198b783be9d5055ceacfd27449448f 100644
--- a/ansible/wipe-disks.yml
+++ b/ansible/wipe-disks.yml
@@ -8,7 +8,7 @@
 # also closed and removed from crypttab.
 
 - name: Ensure that all unmounted block devices are wiped
-  hosts: seed-hypervisor:seed:overcloud
+  hosts: seed-hypervisor:seed:overcloud:infra-vms
   tags:
     - wipe-disks
   roles: