diff --git a/tools/setup-ovs.sh b/tools/setup-ovs.sh
index c0366dc5..87dfa73b 100755
--- a/tools/setup-ovs.sh
+++ b/tools/setup-ovs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-OVS_BRANCH=${OVS_BRANCH:-master}
+OVS_BRANCH=${OVS_BRANCH:-main}
 OVN_BRANCH=${OVN_BRANCH:-main}
 
 function use_new_ovn_repository {
diff --git a/tox.ini b/tox.ini
index e33f1042..ca57349e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,12 @@ minversion = 3.1.1
 envlist = py3,pep8
 skipsdist = True
 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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 3e16c1bd..01d5ea3b 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,7 +1,6 @@
 - project:
     templates:
       - check-requirements
-      - openstack-lower-constraints-jobs
       - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
     check: