diff --git a/.zuul.yaml b/.zuul.yaml
index 03bfce4..c544d2a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,9 +24,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-1
         - cinder-tempest-plugin-basic-2024-2
         - cinder-tempest-plugin-basic-2024-1
-        - cinder-tempest-plugin-basic-2023-2
         - cinder-tempest-plugin-protection-functional
     gate:
       jobs:
@@ -37,9 +37,9 @@
         - cinder-tempest-plugin-cbak-ceph
     experimental:
       jobs:
+        - cinder-tempest-plugin-cbak-ceph-2025-1
         - cinder-tempest-plugin-cbak-ceph-2024-2
         - cinder-tempest-plugin-cbak-ceph-2024-1
-        - cinder-tempest-plugin-cbak-ceph-2023-2
 
 - job:
     name: cinder-tempest-plugin-protection-functional
@@ -282,7 +282,6 @@
       # bypasses nova's checks.  Until the nova team decides on a strategy to handle
       # this issue, we skip these tests.
       tempest_exclude_regex: (tempest.api.image.v2.test_images_formats.ImagesFormatTest.test_compute_rejects)
-      configure_swap_size: 4096
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -295,6 +294,12 @@
     timeout: 10800
 
 - job:
+    name: cinder-tempest-plugin-cbak-ceph-2025-1
+    parent: cinder-tempest-plugin-cbak-ceph
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2025.1
+
+- job:
     name: cinder-tempest-plugin-cbak-ceph-2024-2
     parent: cinder-tempest-plugin-cbak-ceph
     nodeset: openstack-single-node-jammy
@@ -306,12 +311,6 @@
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.1
 
-- job:
-    name: cinder-tempest-plugin-cbak-ceph-2023-2
-    parent: cinder-tempest-plugin-cbak-ceph
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.2
-
 # variant for pre-Ussuri branches (no volume revert for Ceph),
 # should this job be used on those branches
 - job:
@@ -434,6 +433,12 @@
       - ^releasenotes/.*$
 
 - job:
+    name: cinder-tempest-plugin-basic-2025-1
+    parent: cinder-tempest-plugin-basic
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2025.1
+
+- job:
     name: cinder-tempest-plugin-basic-2024-2
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
@@ -444,9 +449,3 @@
     parent: cinder-tempest-plugin-basic
     nodeset: openstack-single-node-jammy
     override-checkout: stable/2024.1
-
-- job:
-    name: cinder-tempest-plugin-basic-2023-2
-    parent: cinder-tempest-plugin-basic
-    nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.2