diff --git a/.zuul.yaml b/.zuul.yaml
index 8cc97d0..d360b5b 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 ba64d62..0f6cd1a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,8 +24,8 @@ install_command = python -m pip install {env:PIP_OPTIONS:} {opts} {packages}
 # NOTE: Functional tests may fail if host is missing bindeps from deps projects
 deps =
     -r{toxinidir}/test-requirements.txt
-    git+https://opendev.org/openstack/os-brick@stable/wallaby#egg=os-brick
-    git+https://opendev.org/openstack/cinder@stable/wallaby#egg=cinder
+    git+https://opendev.org/openstack/os-brick@unmaintained/wallaby#egg=os-brick
+    git+https://opendev.org/openstack/cinder@unmaintained/wallaby#egg=cinder
 
 commands =
     find . -ignore_readdir_race -type f -name "*.pyc" -delete