diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9c078726..e2239cee 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-focal
+    name: openstack-ansible-deploy-aio_lxb_lxc-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
 - job:
-    name: openstack-ansible-deploy-aio_metal_ovn-ubuntu-focal
+    name: openstack-ansible-deploy-aio_lxb_metal-ubuntu-focal
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-focal
 
@@ -51,11 +51,11 @@
     nodeset: centos-9-stream
 
 - job:
-    name: openstack-ansible-deploy-aio_ovn_lxc-centos-9-stream
+    name: openstack-ansible-deploy-aio_lxb_lxc-centos-9-stream
     parent: openstack-ansible-deploy-aio
     nodeset: centos-9-stream
 
 - job:
-    name: openstack-ansible-deploy-aio_ovn_metal-centos-9-stream
+    name: openstack-ansible-deploy-aio_lxb_metal-centos-9-stream
     parent: openstack-ansible-deploy-aio
     nodeset: centos-9-stream
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b16d26aa..ce431720 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,8 +17,8 @@
     templates:
       - check-requirements
       - openstack-ansible-linters-jobs
-      #- openstack-ansible-deploy-aio_metal-jobs
-      #- openstack-ansible-deploy-aio_distro_metal-jobs
+      - openstack-ansible-deploy-aio_metal-jobs
+      - openstack-ansible-deploy-aio_distro_metal-jobs
       - publish-openstack-docs-pti
       - build-release-notes-jobs-python3
     check:
@@ -29,17 +29,17 @@
         - openstack-ansible-deploy-aio_metal_ovs-ubuntu-focal
         - 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
+        - openstack-ansible-deploy-aio_lxb_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_lxb_metal-centos-9-stream
+        - openstack-ansible-deploy-aio_lxb_lxc-ubuntu-focal
+        - openstack-ansible-deploy-aio_lxb_metal-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-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
+        - openstack-ansible-deploy-aio_lxb_lxc-centos-9-stream
+        - openstack-ansible-deploy-aio_lxb_metal-centos-9-stream
+        - openstack-ansible-deploy-aio_lxb_lxc-ubuntu-focal
+        - openstack-ansible-deploy-aio_lxb_metal-ubuntu-focal