diff --git a/.zuul.yaml b/.zuul.yaml
index 114e4c5..4aeb73a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
     name: x/group-based-policy-automation
     templates:
-      - openstack-python3-antelope-jobs
+      - openstack-python3-jobs
       - publish-to-pypi
     # REVISIT: In the jobs below, the required-projects clause is needed on
     # the master branch to select the correct version of the requirements
@@ -12,27 +12,32 @@
     check:
       jobs:
         - openstack-tox-pep8:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py38:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py39:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py310:
+            nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py311:
-            voting: false
+            nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py312:
+            nodeset: ubuntu-noble
             voting: false
             required-projects:
               - name: openstack/requirements
@@ -40,27 +45,32 @@
     gate:
       jobs:
         - openstack-tox-pep8:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py38:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py39:
+            nodeset: ubuntu-focal
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py310:
+            nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py311:
-            voting: false
+            nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
                 override-checkout: stable/2024.1
         - openstack-tox-py312:
+            nodeset: ubuntu-noble
             voting: false
             required-projects:
               - name: openstack/requirements