diff --git a/hack/ci/cloud-init/controller.yaml.tpl b/hack/ci/cloud-init/controller.yaml.tpl
index 174bf04154..5cf6d77edb 100644
--- a/hack/ci/cloud-init/controller.yaml.tpl
+++ b/hack/ci/cloud-init/controller.yaml.tpl
@@ -191,6 +191,9 @@
 
     # from https://raw.githubusercontent.com/openstack/octavia/master/devstack/contrib/new-octavia-devstack.sh
     git clone -b stable/${OPENSTACK_RELEASE} https://github.com/openstack/devstack.git /tmp/devstack
+    # This is a temporary hack until https://review.opendev.org/c/openstack/devstack/+/936961 gets merged or the problem gets solved
+    # by another way to address https://github.com/pypa/setuptools/issues/4483.
+    (cd /tmp/devstack; git fetch https://review.opendev.org/openstack/devstack refs/changes/61/936961/1 && git cherry-pick FETCH_HEAD)
     cp /tmp/local.conf /tmp/devstack/
 
     # Create the stack user
diff --git a/hack/ci/cloud-init/worker.yaml.tpl b/hack/ci/cloud-init/worker.yaml.tpl
index ccbf79411d..e0dd2b87cb 100644
--- a/hack/ci/cloud-init/worker.yaml.tpl
+++ b/hack/ci/cloud-init/worker.yaml.tpl
@@ -67,6 +67,9 @@
 
     # from https://raw.githubusercontent.com/openstack/octavia/master/devstack/contrib/new-octavia-devstack.sh
     git clone -b stable/${OPENSTACK_RELEASE} https://github.com/openstack/devstack.git /tmp/devstack
+    # This is a temporary hack until https://review.opendev.org/c/openstack/devstack/+/936961 gets merged or the problem gets solved
+    # by another way to address https://github.com/pypa/setuptools/issues/4483.
+    (cd /tmp/devstack; git fetch https://review.opendev.org/openstack/devstack refs/changes/61/936961/1 && git cherry-pick FETCH_HEAD)
     cp /tmp/local.conf /tmp/devstack/
 
     # Create the stack user