diff --git a/inc/python b/inc/python
index cd90ac82c6..b453b739f4 100644
--- a/inc/python
+++ b/inc/python
@@ -41,7 +41,9 @@ function setup_devstack_virtualenv {
         # This package is currently installed via the distro and not
         # available on pypi.
         $PYTHON -m venv --system-site-packages "${DEVSTACK_VENV}"
-        pip_install -U pip setuptools[core]
+        # NOTE(stephenfin) stable-only change to pin setuptools to the last
+        # version to support pkg_resources
+        pip_install -U pip 'setuptools[core]<81.0.0'
     fi
     if [[ ":$PATH:" != *":$DEVSTACK_VENV/bin:"* ]] ; then
         export PATH="$DEVSTACK_VENV/bin:$PATH"
diff --git a/lib/infra b/lib/infra
index f4760c352c..7f262939f8 100644
--- a/lib/infra
+++ b/lib/infra
@@ -31,7 +31,9 @@ function install_infra {
     local PIP_VIRTUAL_ENV="$REQUIREMENTS_DIR/.venv"
     [ ! -d $PIP_VIRTUAL_ENV ] && ${VIRTUALENV_CMD} $PIP_VIRTUAL_ENV
     # We don't care about testing git pbr in the requirements venv.
-    PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr setuptools[core]
+    # NOTE(stephenfin) stable-only change to pin setuptools to the last version
+    # to support pkg_resources
+    PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install -U pbr 'setuptools[core]<81.0.0'
     PIP_VIRTUAL_ENV=$PIP_VIRTUAL_ENV pip_install $REQUIREMENTS_DIR
 
     # Unset the PIP_VIRTUAL_ENV so that PBR does not end up trapped