diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml
index ac18fd15090..eda26808c0f 100644
--- a/.github/workflows/release_wheel_creation.yml
+++ b/.github/workflows/release_wheel_creation.yml
@@ -37,7 +37,8 @@ jobs:
         with:
           output-dir: dist
         env:
-            CIBW_SKIP: "pp* cp36* cp37* *-musllinux-*"
+            CIBW_PLATFORM: auto
+            CIBW_SKIP: "pp* cp36* cp37* *-musllinux*"
             CIBW_BUILD_VERBOSITY: 1
             CIBW_ARCHS: ${{ matrix.arch }}
             CIBW_BEFORE_BUILD: pip install cython pybind11
diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml
index 9fea047122c..ddded4f8a69 100644
--- a/.github/workflows/test_branches.yml
+++ b/.github/workflows/test_branches.yml
@@ -235,6 +235,7 @@ jobs:
       run: |
         python -c 'import sys;print(sys.executable)'
         python -m pip install --cache-dir cache/pip --upgrade pip
+        python -m pip install --cache-dir cache/pip setuptools
         PYOMO_DEPENDENCIES=`python setup.py dependencies \
             --extras "$EXTRAS" | tail -1`
         PACKAGES="${PYTHON_CORE_PKGS} ${PYTHON_PACKAGES} ${PYOMO_DEPENDENCIES} "