diff --git a/.zuul.yaml b/.zuul.yaml
index 766c0ec..50e5fdf 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,9 +28,9 @@
         # As per the Tempest "Stable Branch Support Policy", Tempest will only
         # support the "Maintained" stable branches, so only jobs for the
         # current stable branches should be listed here.
+        - cinder-tempest-plugin-basic-2025-2
         - cinder-tempest-plugin-basic-2025-1
         - cinder-tempest-plugin-basic-2024-2
-        - cinder-tempest-plugin-basic-2024-1
         - cinder-tempest-plugin-protection-functional
     gate:
       jobs:
@@ -41,9 +41,9 @@
         - cinder-tempest-plugin-cbak-ceph
     experimental:
       jobs:
+        - cinder-tempest-plugin-cbak-ceph-2025-2
         - cinder-tempest-plugin-cbak-ceph-2025-1
         - cinder-tempest-plugin-cbak-ceph-2024-2
-        - cinder-tempest-plugin-cbak-ceph-2024-1
 
 - job:
     name: cinder-tempest-plugin-protection-functional
@@ -298,6 +298,12 @@
     timeout: 10800
 
 - job:
+    name: cinder-tempest-plugin-cbak-ceph-2025-2
+    parent: cinder-tempest-plugin-cbak-ceph
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.2
+
+- job:
     name: cinder-tempest-plugin-cbak-ceph-2025-1
     parent: cinder-tempest-plugin-cbak-ceph
     nodeset: openstack-single-node-jammy
@@ -308,12 +314,6 @@
     parent: cinder-tempest-plugin-cbak-ceph
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.2
-
-- job:
-    name: cinder-tempest-plugin-cbak-ceph-2024-1
-    parent: cinder-tempest-plugin-cbak-ceph
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2024.1
 
 # variant for pre-Ussuri branches (no volume revert for Ceph),
 # should this job be used on those branches
@@ -473,6 +473,12 @@
       - ^releasenotes/.*$
 
 - job:
+    name: cinder-tempest-plugin-basic-2025-2
+    parent: cinder-tempest-plugin-basic
+    nodeset: openstack-single-node-noble
+    override-checkout: stable/2025.2
+
+- job:
     name: cinder-tempest-plugin-basic-2025-1
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
@@ -483,9 +489,3 @@
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.2
-
-- job:
-    name: cinder-tempest-plugin-basic-2024-1
-    parent: cinder-tempest-plugin-basic
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2024.1