diff --git a/.zuul.yaml b/.zuul.yaml
index 752d30b4..1d9f4a6f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,17 +1,19 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - openstack-python3-antelope-jobs
       - release-notes-jobs-python3
     check:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py38
         - openstack-tox-py39
+        - openstack-tox-py310
         - openstack-tox-py311
+        - openstack-tox-py312
         - python-tempestconf-tempest-devstack-admin
-        - python-tempestconf-tempest-devstack-admin-yoga
-        - python-tempestconf-tempest-devstack-admin-zed
         - python-tempestconf-tempest-devstack-admin-2023-1
         - python-tempestconf-tempest-devstack-admin-2023-2
+        - python-tempestconf-tempest-devstack-admin-2024-1
         - python-tempestconf-tempest-devstack-admin-fips-centos9
         - python-tempestconf-tempest-devstack-demo
         - python-tempestconf-tempest-devstack-admin-plugins
@@ -30,12 +32,16 @@
         - opendev-tox-docs
     gate:
       jobs:
+        - openstack-tox-pep8
+        - openstack-tox-py38
         - openstack-tox-py39
+        - openstack-tox-py310
+        - openstack-tox-py311
+        - openstack-tox-py312
         - python-tempestconf-tempest-devstack-admin
-        - python-tempestconf-tempest-devstack-admin-yoga
-        - python-tempestconf-tempest-devstack-admin-zed
         - python-tempestconf-tempest-devstack-admin-2023-1
         - python-tempestconf-tempest-devstack-admin-2023-2
+        - python-tempestconf-tempest-devstack-admin-2024-1
         - python-tempestconf-tempest-devstack-demo
         - python-tempestconf-tempest-devstack-admin-plugins
         - refstack-client-devstack-master:
@@ -46,12 +52,9 @@
         - opendev-promote-docs
     experimental:
       jobs:
-        - python-tempestconf-tempest-devstack-demo-yoga
-        - python-tempestconf-tempest-devstack-demo-zed
         - python-tempestconf-tempest-devstack-demo-2023-1
         - python-tempestconf-tempest-devstack-demo-2023-2
-        - refstack-client-devstack-yoga
-        - refstack-client-devstack-zed
+        - python-tempestconf-tempest-devstack-demo-2024-1
         - refstack-client-devstack-2023-1
 
 
@@ -203,21 +206,6 @@
       nslookup_target: 'opendev.org'
       enable_fips: true
 
-- job:
-    name: python-tempestconf-tempest-devstack-admin-yoga
-    parent: python-tempestconf-tempest-devstack-admin
-    override-checkout: stable/yoga
-    vars:
-      branch: stable/yoga
-
-- job:
-    name: python-tempestconf-tempest-devstack-admin-zed
-    parent: python-tempestconf-tempest-devstack-admin
-    override-checkout: stable/zed
-    vars:
-      branch: stable/zed
-      ensure_tox_version: '<4'
-
 - job:
     name: python-tempestconf-tempest-devstack-admin-2023-1
     parent: python-tempestconf-tempest-devstack-admin
@@ -232,6 +220,13 @@
     vars:
       branch: stable/2023.2
 
+- job:
+    name: python-tempestconf-tempest-devstack-admin-2024-1
+    parent: python-tempestconf-tempest-devstack-admin
+    override-checkout: stable/2024.1
+    vars:
+      branch: stable/2024.1
+
 - job:
     name: python-tempestconf-tempest-devstack-demo
     parent: python-tempestconf-devstack-base
@@ -251,20 +246,6 @@
       # is resolved
       tempest_exclude_regex: 'tempest.api.compute.servers'
 
-- job:
-    name: python-tempestconf-tempest-devstack-demo-yoga
-    parent: python-tempestconf-tempest-devstack-demo
-    override-checkout: stable/yoga
-    vars:
-      branch: stable/yoga
-
-- job:
-    name: python-tempestconf-tempest-devstack-demo-zed
-    parent: python-tempestconf-tempest-devstack-demo
-    override-checkout: stable/zed
-    vars:
-      branch: stable/zed
-
 - job:
     name: python-tempestconf-tempest-devstack-demo-2023-1
     parent: python-tempestconf-tempest-devstack-demo
@@ -279,6 +260,13 @@
     vars:
       branch: stable/2023.2
 
+- job:
+    name: python-tempestconf-tempest-devstack-demo-2024-1
+    parent: python-tempestconf-tempest-devstack-demo
+    override-checkout: stable/2024.1
+    vars:
+      branch: stable/2024.1
+
 - job:
     name: python-tempestconf-tempest-packstack-admin
     parent: python-tempestconf-packstack-base
diff --git a/setup.cfg b/setup.cfg
index 0eb30da7..27934bd0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,8 @@ classifier =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 
 [files]
 packages =