diff --git a/.zuul.yaml b/.zuul.yaml
index 89ec7c2..557400a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,20 +1,20 @@
 - job:
-    name: zun-tempest-py3-docker-sql-yoga
-    parent: zun-tempest-py3-docker-sql
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/yoga
-
-- job:
-    name: zun-tempest-py3-docker-sql-zed
-    parent: zun-tempest-py3-docker-sql
-    nodeset: openstack-single-node-focal
-    override-checkout: stable/zed
-
-- job:
-    name: zun-tempest-py3-docker-sql-2023-1
+    name: zun-tempest-py3-docker-sql-2023-2
     parent: zun-tempest-py3-docker-sql
     nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.1
+    override-checkout: stable/2023.2
+
+- job:
+    name: zun-tempest-py3-docker-sql-2024-1
+    parent: zun-tempest-py3-docker-sql
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2024.1
+
+- job:
+    name: zun-tempest-py3-docker-sql-2024-2
+    parent: zun-tempest-py3-docker-sql
+    nodeset: openstack-single-node-jammy
+    override-checkout: stable/2024.2
 
 - project:
     queue: zun
@@ -25,13 +25,10 @@
     check:
       jobs:
         - zun-tempest-py3-docker-sql
-        - zun-tempest-py3-docker-sql-yoga
-        - zun-tempest-py3-docker-sql-zed
-        - zun-tempest-py3-docker-sql-2023-1
+        - zun-tempest-py3-docker-sql-2023-2
+        - zun-tempest-py3-docker-sql-2024-1
+        - zun-tempest-py3-docker-sql-2024-2
         - zun-tempest-multinode-docker-sql
     gate:
       jobs:
         - zun-tempest-py3-docker-sql
-        - zun-tempest-py3-docker-sql-yoga
-        - zun-tempest-py3-docker-sql-zed
-        - zun-tempest-py3-docker-sql-2023-1
diff --git a/zun_tempest_plugin/tests/tempest/api/clients.py b/zun_tempest_plugin/tests/tempest/api/clients.py
index 8b35408..8c792a1 100644
--- a/zun_tempest_plugin/tests/tempest/api/clients.py
+++ b/zun_tempest_plugin/tests/tempest/api/clients.py
@@ -97,7 +97,7 @@ class Manager(clients.ServiceClients):
                 self.auth_provider, 'network', CONF.identity.region,
                 disable_ssl_certificate_validation=True)
         self.vol_client = volumes_client.VolumesClient(
-            self.auth_provider, 'volumev3', CONF.identity.region,
+            self.auth_provider, 'block-storage', CONF.identity.region,
             disable_ssl_certificate_validation=True)
         self.container_client = ZunClient(self.auth_provider)
         self.neutron_client = networks_client.NetworksClient(