diff --git a/.zuul.yaml b/.zuul.yaml
index 736aa84..5d0e0a5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,14 +10,14 @@
             nodeset: debian-bookworm
         - tox-py312:
             nodeset: ubuntu-noble
-        - opendev-buildset-registry
-        - nodepool-build-image-siblings
-        - dib-nodepool-functional-openstack-gentoo-src:
+        - dib-devstack-functional-openstack-gentoo-src:
             voting: false
-        - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-ubuntu-focal-src
-        - dib-nodepool-functional-openstack-debian-bullseye-src
-        - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
+        - dib-devstack-functional-openstack-centos-9-stream-src
+        - dib-devstack-functional-openstack-ubuntu-focal-src
+        - dib-devstack-functional-openstack-ubuntu-jammy-src
+        - dib-devstack-functional-openstack-ubuntu-noble-src
+        - dib-devstack-functional-openstack-debian-bullseye-src
+        - dib-devstack-functional-openstack-rockylinux-8-containerfile-src
     gate:
       jobs:
         - tox-pep8
@@ -29,12 +29,12 @@
             nodeset: debian-bookworm
         - tox-py312:
             nodeset: ubuntu-noble
-        - opendev-buildset-registry
-        - nodepool-build-image-siblings
-        - dib-nodepool-functional-openstack-centos-9-stream-src
-        - dib-nodepool-functional-openstack-ubuntu-focal-src
-        - dib-nodepool-functional-openstack-debian-bullseye-src
-        - dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
+        - dib-devstack-functional-openstack-centos-9-stream-src
+        - dib-devstack-functional-openstack-ubuntu-focal-src
+        - dib-devstack-functional-openstack-ubuntu-jammy-src
+        - dib-devstack-functional-openstack-ubuntu-noble-src
+        - dib-devstack-functional-openstack-debian-bullseye-src
+        - dib-devstack-functional-openstack-rockylinux-8-containerfile-src
     post:
       jobs:
         - publish-openstack-python-branch-tarball