diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index 318432e67..123d5686b 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -76,14 +76,12 @@
             cmd: dev/overcloud-test-vm.sh &> {{ logs_dir }}/ansible/overcloud-test-vm-pre-upgrade
             chdir: "{{ previous_kayobe_src_dir }}"
             executable: /bin/bash
-          when: ansible_facts.os_family != 'Debian'
 
         - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
           shell:
             cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
             chdir: "{{ previous_kayobe_src_dir }}"
             executable: /bin/bash
-          when: ansible_facts.os_family != 'Debian'
 
         # Upgrade Kayobe, and use it to perform an upgrade of the control plane.
 
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index af36ff137..63ddb2a0a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,6 +22,8 @@
         - kayobe-ansible-control-host-configure-rocky10-podman
         - kayobe-ansible-control-host-configure-ubuntu-noble
         - kayobe-ansible-control-host-configure-ubuntu-noble-podman
+        - kayobe-infra-vm-rocky10
+        - kayobe-infra-vm-ubuntu-noble
         - kayobe-overcloud-host-configure-rocky10
         - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-rocky10
@@ -31,6 +33,8 @@
         - kayobe-overcloud-ubuntu-noble-podman
         - kayobe-overcloud-upgrade-rocky10
         - kayobe-overcloud-upgrade-slurp-rocky10
+        - kayobe-overcloud-upgrade-slurp-ubuntu-noble
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky10
         - kayobe-seed-rocky10-podman
         - kayobe-seed-ubuntu-noble
@@ -39,6 +43,8 @@
         - kayobe-seed-upgrade-slurp-rocky10
         - kayobe-seed-upgrade-slurp-ubuntu-noble
         - kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-vm-rocky10
+        - kayobe-seed-vm-ubuntu-noble
     gate:
       jobs:
         - openstack-tox-py310:
@@ -52,6 +58,8 @@
         - kayobe-tox-molecule
         - kayobe-ansible-control-host-configure-rocky10
         - kayobe-ansible-control-host-configure-ubuntu-noble
+        - kayobe-infra-vm-rocky10
+        - kayobe-infra-vm-ubuntu-noble
         - kayobe-overcloud-host-configure-rocky10
         - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-rocky10
@@ -61,6 +69,8 @@
         - kayobe-overcloud-ubuntu-noble-podman
         - kayobe-overcloud-upgrade-rocky10
         - kayobe-overcloud-upgrade-slurp-rocky10
+        - kayobe-overcloud-upgrade-slurp-ubuntu-noble
+        - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-rocky10
         - kayobe-seed-rocky10-podman
         - kayobe-seed-ubuntu-noble
@@ -69,6 +79,8 @@
         - kayobe-seed-upgrade-slurp-rocky10
         - kayobe-seed-upgrade-slurp-ubuntu-noble
         - kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-vm-rocky10
+        - kayobe-seed-vm-ubuntu-noble
 
     experimental:
       jobs: