diff --git a/.zuul.yaml b/.zuul.yaml
index 8ec2315a0e..5c17a19e9f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -10,11 +10,11 @@
       - zuul: opendev.org/openstack/devstack
       - zuul: opendev.org/openstack/tempest
     required-projects:
-      - openstack/devstack-gate
       - openstack/barbican
       - openstack/heat
       - openstack/heat-templates
-      - openstack/heat-tempest-plugin
+      - name: opendev.org/openstack/heat-tempest-plugin
+        override-checkout: yoga-last
       - openstack/octavia
       - openstack/neutron
       - openstack/oslo.messaging
@@ -139,7 +139,8 @@
     voting: false
     required-projects:
       - opendev.org/openstack/heat
-      - opendev.org/openstack/heat-tempest-plugin
+      - name: opendev.org/openstack/heat-tempest-plugin
+        override-checkout: yoga-last
       - opendev.org/openstack/python-heatclient
     vars:
       grenade_devstack_localrc:
@@ -197,10 +198,20 @@
     check:
       jobs:
         - grenade-heat-multinode
-        - heat-functional
-        - heat-functional-legacy
+        # NOTE(elod.illes): functional jobs are failing due to
+        # python-zaqarclient dropped py38 support and even on
+        # this old branch the client is installed from master
+        # as a quick workaround this is now set as non-voting
+        - heat-functional:
+            voting: false
+        - heat-functional-legacy:
+            voting: false
     gate:
       jobs:
         - grenade-heat-multinode
-        - heat-functional
-        - heat-functional-legacy
+        # NOTE(elod.illes): functional jobs are failing due to
+        # python-zaqarclient dropped py38 support and even on
+        # this old branch the client is installed from master
+        # as a quick workaround this is now removed from gate
+        # - heat-functional
+        # - heat-functional-legacy
diff --git a/devstack/lib/heat b/devstack/lib/heat
index 4e76fe4a26..bf6ecc0b40 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -478,11 +478,14 @@ function configure_tempest_for_heat {
         source /etc/ci/mirror_info.sh
     fi
     HEAT_TEST_FEDORA_IMAGE_UPSTREAM=https://download.fedoraproject.org/pub/fedora/linux
+    HEAT_TEST_FEDORA_IMAGE_UPSTREAM_ARCHIVE=https://download.fedoraproject.org/pub/archive/fedora/linux/
     HEAT_TEST_FEDORA_IMAGE_PATH=releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2
-    if curl --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
+    if curl --location --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
         export HEAT_TEST_FEDORA_IMAGE="${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
-    else
+    elif curl --location --output /dev/null --silent --head --fail "${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then
         export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
+    else
+        export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM_ARCHIVE}/${HEAT_TEST_FEDORA_IMAGE_PATH}"
     fi
     TOKEN=$(openstack token issue -c id -f value)
     local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-37-1.7.x86_64" )
diff --git a/tox.ini b/tox.ini
index b70f48a982..382a98e1b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,12 @@ envlist = py36,py37,py38,pep8
 ignore_basepython_conflict = True
 minversion = 3.1.0
 skipsdist = 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