diff --git a/.gitreview b/.gitreview
index 75966f187e7..1cee2f3c92d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/horizon.git
-defaultbranch=stable/yoga
+defaultbranch=unmaintained/yoga
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 945d7a766e6..e151f7ad99b 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -6,7 +6,6 @@
       - horizon-nodejs14-jobs
       - horizon-non-primary-django-jobs
       - openstack-python3-yoga-jobs
-      - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:
@@ -14,7 +13,8 @@
         - horizon-selenium-headless
         - horizon-integration-tests
         - horizon-dsvm-tempest-plugin
-        - horizon-tox-bandit-baseline
+        - horizon-tox-bandit-baseline:
+            voting: false
         - horizon-tempest-plugin-ipv6
     gate:
       jobs:
@@ -27,7 +27,3 @@
         - horizon-integration-tests-xstatic-master
         - horizon-tox-py36-xstatic-master
         - horizon-nodejs14-run-test-xstatic-master
-    periodic:
-      jobs:
-        - horizon-nodejs14-run-test
-        - horizon-integration-tests
diff --git a/tox.ini b/tox.ini
index d2585bb567b..6847ee789e6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,11 @@ skipsdist = True
 # env and ignore basepython inherited from [testenv] if we set
 # ignore_basepython_conflict.
 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
 
 [testenv]
 basepython = python3