diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index dfbc06ee..9c078726 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -15,12 +15,12 @@
 
 # Ubuntu Focal
 - job:
-    name: openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal2
+    name: openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
 - job:
-    name: openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal2
+    name: openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
@@ -34,28 +34,28 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
-# Ubuntu Bionic
 - job:
     name: openstack-ansible-deploy-aio_metal_calico-ubuntu-focal
     parent: openstack-ansible-deploy-aio_metal-ubuntu-focal
+    nodeset: ubuntu-focal
 
-# CentOS 8
+# CentOS 9
 - job:
-    name: openstack-ansible-deploy-aio_ovs_lxc-centos-8-stream
+    name: openstack-ansible-deploy-aio_ovs_lxc-centos-9-stream
     parent: openstack-ansible-deploy-aio
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
 
 - job:
-    name: openstack-ansible-deploy-aio_metal_ovs-centos-8-stream
+    name: openstack-ansible-deploy-aio_metal_ovs-centos-9-stream
     parent: openstack-ansible-deploy-aio
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
 
 - job:
-    name: openstack-ansible-deploy-aio_ovn_lxc-centos-8-stream
+    name: openstack-ansible-deploy-aio_ovn_lxc-centos-9-stream
     parent: openstack-ansible-deploy-aio
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
 
 - job:
-    name: openstack-ansible-deploy-aio_ovn_metal-centos-8-stream
+    name: openstack-ansible-deploy-aio_ovn_metal-centos-9-stream
     parent: openstack-ansible-deploy-aio
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e6854f95..62e72944 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -27,19 +27,19 @@
             voting: false
         - openstack-ansible-deploy-aio_ovs_lxc-ubuntu-focal
         - openstack-ansible-deploy-aio_metal_ovs-ubuntu-focal
-        - openstack-ansible-deploy-aio_ovs_lxc-centos-8-stream
-        - openstack-ansible-deploy-aio_metal_ovs-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_lxc-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_metal-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal2
-        - openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal2
+        - openstack-ansible-deploy-aio_ovs_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_metal_ovs-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_metal-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal
+        - openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal
     gate:
       jobs:
         - openstack-ansible-deploy-aio_ovs_lxc-ubuntu-focal
         - openstack-ansible-deploy-aio_metal_ovs-ubuntu-focal
-        - openstack-ansible-deploy-aio_ovs_lxc-centos-8-stream
-        - openstack-ansible-deploy-aio_metal_ovs-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_lxc-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_metal-centos-8-stream
-        - openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal2
-        - openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal2
+        - openstack-ansible-deploy-aio_ovs_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_metal_ovs-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_metal-centos-9-stream
+        - openstack-ansible-deploy-aio_ovn_lxc-ubuntu-focal
+        - openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal