diff --git a/zuul.d/rally.yaml b/zuul.d/rally.yaml
index 80a3bd24003..c04758d744a 100644
--- a/zuul.d/rally.yaml
+++ b/zuul.d/rally.yaml
@@ -14,6 +14,17 @@
         neutron: https://opendev.org/openstack/neutron
       devstack_services:
         neutron-trunk: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
       devstack_local_conf:
         post-config:
           $NEUTRON_CONF:
@@ -66,6 +77,17 @@
         q-meta: false
         q-metering: false
         q-dns: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
       devstack_localrc:
         Q_AGENT: ovn
         ML2_L3_PLUGIN: ovn-router,trunk
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index cc65db8bce7..afde52f073d 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -26,6 +26,17 @@
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
       devstack_local_conf:
@@ -66,6 +77,17 @@
           q-meta: true
           br-ex-tcpdump: true
           br-int-flows: true
+          # Cinder services
+          c-api: false
+          c-bak: false
+          c-sch: false
+          c-vol: false
+          cinder: false
+          # Swift services
+          s-account: false
+          s-container: false
+          s-object: false
+          s-proxy: false
         devstack_local_conf:
           post-config:
             $NEUTRON_CONF:
@@ -98,6 +120,26 @@
       tox_envlist: integrated-network
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
+      devstack_services:
+        br-ex-tcpdump: true
+        br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+    group-vars:
+      subnode:
+        devstack_services:
+          # Cinder services
+          c-bak: false
+          c-vol: false
 
 - job:
     name: neutron-ovn-multinode-base
@@ -148,7 +190,6 @@
       extensions_to_txt:
         db: true
       devstack_services:
-        c-bak: false
         etcd: false
         br-ex-tcpdump: true
         br-int-flows: true
@@ -165,6 +206,12 @@
         q-meta: false
         q-metering: false
         q-dns: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
         # When running python3 Swift should be disabled for now
         s-account: false
         s-container: false
@@ -194,6 +241,9 @@
           q-metering: false
           q-ovn-metadata-agent: true
           tls-proxy: true
+          # Cinder services
+          c-bak: false
+          c-vol: false
         devstack_localrc:
           Q_AGENT: ovn
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index b5593123ee1..c85243b32c0 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -29,6 +29,17 @@
         q-meta: true
         q-metering: true
         q-svc: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
 
 - job:
     name: neutron-ovs-base
@@ -135,6 +146,17 @@
         mysql: false
         br-ex-tcpdump: true
         br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
     irrelevant-files: *irrelevant-files
 
 - job:
@@ -152,6 +174,17 @@
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
     # NOTE(ralonsoh): once MariaDB default version in Ubuntu is bumped to
     # >10.1, this workaround can be removed (bug 1855912)
     pre-run: playbooks/add_mariadb_repo.yaml
@@ -170,6 +203,17 @@
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
     irrelevant-files: *irrelevant-files
 
 - job:
@@ -215,9 +259,6 @@
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true
-        c-api: true
-        c-sch: true
-        c-vol: true
         dstat: true
         g-api: true
         g-reg: true
@@ -238,7 +279,6 @@
         placement-api: true
         q-svc: true
         q-dns: true
-        c-bak: false
         etcd: false
         q-agt: false
         q-dhcp: false
@@ -253,6 +293,12 @@
         tls-proxy: true
         q-qos: true
         q-port-forwarding: true
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
 
 - job:
     name: neutron-ovn-tempest-ovs-ipv6-only-base