diff --git a/.zuul.yaml b/.zuul.yaml
index 1b1fbc9..e00c8e7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,14 +2,14 @@
     queue: integrated
     templates:
       - publish-openstack-docs-pti
-      - release-notes-jobs-python3
     check:
       jobs:
         - openstack-tox-pep8
         - cinderlib-tox-py36
         - cinderlib-tox-py37
 
-        - cinderlib-lvm-functional
+        - cinderlib-lvm-functional:
+            voting: false
         - cinderlib-ceph-functional
         - os-brick-src-tempest-lvm-lio-barbican
     gate:
@@ -18,7 +18,6 @@
         - cinderlib-tox-py36
         - cinderlib-tox-py37
 
-        - cinderlib-lvm-functional
         - cinderlib-ceph-functional
         - os-brick-src-tempest-lvm-lio-barbican
     post:
@@ -54,7 +53,7 @@
     name: cinderlib-lvm-functional
     parent: cinderlib-functional
     pre-run: playbooks/setup-lvm.yaml
-    nodeset: centos-8-stream
+    nodeset: centos-9-stream
     vars:
       tox_environment:
         # Workaround for https://github.com/pypa/pip/issues/6264
diff --git a/tox.ini b/tox.ini
index 61b3e86..58ca942 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,12 @@ setenv = VIRTUAL_ENV={envdir}
 # this allows tox to infer the base python from the environment name
 # and override any basepython configured in this file
 ignore_basepython_conflict=true
+# Cap setuptools via virtualenv to prevent compatibility issue with yoga
+# branch's upper constraint of 'packaging' package (21.3).
+requires =
+  virtualenv<20.26.4
+  tox<4
+  setuptools<71.0.0
 
 [testenv]
 basepython=python3