diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 459f8c85..d926b87f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -3,6 +3,24 @@
 #    https://opendev.org/openstack/project-config
 #    https://opendev.org/zuul/zuul-jobs
 
+- job:
+    name: openstack-tox
+    abstract: true
+    parent: tox-fips
+    nodeset: ubuntu-noble
+    description: |
+      Base job to run tox jobs with OpenStack project specific updates.
+
+      Processing upper-constraints files from openstack/requirements.
+    branches:
+      regex: ^*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    required-projects:
+      - name: openstack/requirements
+    vars:
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
+      enable_fips: false
+
 - job:
     name: openstack-tox
     abstract: true
@@ -13,8 +31,10 @@
 
       Processing upper-constraints files from openstack/requirements.
     branches:
-      regex: ^stable/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      - ^.*/2023.1
+      - ^.*/2023.2
+      - ^.*/2024.1
+      - ^.*/2024.2
     required-projects:
       - name: openstack/requirements
     vars:
@@ -455,6 +475,24 @@
       bindep_profile: test pep8
       test_setup_skip: true
 
+- job:
+    name: openstack-tox-cover
+    parent: tox-cover
+    description: |
+      Run code coverage tests.
+
+      Uses tox with the ``cover`` environment.
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    required-projects:
+      - name: openstack/requirements
+    irrelevant-files: *common-irrelevant-files
+    vars:
+      tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
+    timeout: 3000
+
 - job:
     name: openstack-tox-cover
     parent: tox-cover
@@ -464,8 +502,10 @@
       Uses tox with the ``cover`` environment.
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      - ^.*/2023.1
+      - ^.*/2023.2
+      - ^.*/2024.1
+      - ^.*/2024.2
     required-projects:
       - name: openstack/requirements
     irrelevant-files: *common-irrelevant-files
@@ -520,6 +560,21 @@
     vars:
       tox_envlist: build
 
+- job:
+    name: openstack-tox-functional
+    parent: openstack-tox
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+    irrelevant-files: *common-irrelevant-files
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    vars:
+      tox_envlist: functional
+
 - job:
     name: openstack-tox-functional
     parent: openstack-tox
@@ -530,8 +585,7 @@
     irrelevant-files: *common-irrelevant-files
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      regex: ^.*/(2023.1|2023.2|2024.1|2024.2)$
     vars:
       tox_envlist: functional
 
@@ -551,6 +605,22 @@
     vars:
       tox_envlist: functional
 
+- job:
+    name: openstack-tox-functional-with-sudo
+    parent: openstack-tox-with-sudo
+    description: |
+      Run tox-based functional tests for an OpenStack Python project.
+
+      Uses tox with the ``functional`` environment.
+      Sudo access is not revoked.
+    irrelevant-files: *common-irrelevant-files
+    nodeset: ubuntu-noble
+    branches:
+      regex: ^.*/(victoria|wallaby|xena|yoga|zed|2023.1|2023.2|2024.1|2024.2)$
+      negate: true
+    vars:
+      tox_envlist: functional
+
 - job:
     name: openstack-tox-functional-with-sudo
     parent: openstack-tox-with-sudo
@@ -562,8 +632,7 @@
     irrelevant-files: *common-irrelevant-files
     nodeset: ubuntu-jammy
     branches:
-      regex: ^.*/(victoria|wallaby|xena|yoga|zed)$
-      negate: true
+      regex: ^.*/(2023.1|2023.2|2024.1|2024.2)$
     vars:
       tox_envlist: functional