diff --git a/.github/workflows/build-linux-aarch64-wheels.yml b/.github/workflows/build-linux-aarch64-wheels.yml
index d35b84cbeb..003e9e311b 100644
--- a/.github/workflows/build-linux-aarch64-wheels.yml
+++ b/.github/workflows/build-linux-aarch64-wheels.yml
@@ -29,10 +29,11 @@ jobs:
           dnf install -y /usr/bin/patch
       - name: Checkout
         uses: actions/checkout@main
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
+      - name: Build wheels
+        run: |
+          python3 -m venv wheelbuilder_venv
+          export PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+          wheelbuilder_venv/bin/python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Build wheels
         run: python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
diff --git a/.github/workflows/build-linux-amd64-wheels.yml b/.github/workflows/build-linux-amd64-wheels.yml
index 9aab57bcbc..a8bffb78d2 100644
--- a/.github/workflows/build-linux-amd64-wheels.yml
+++ b/.github/workflows/build-linux-amd64-wheels.yml
@@ -13,10 +13,8 @@ name: build-linux-amd64-wheels
 jobs:
   build_wheels:
     runs-on:
-      - self-hosted
-      - Linux
-      - ARM64
-    container: quay.io/pypa/manylinux_2_28_amd64
+      - ubuntu-latest
+    container: quay.io/pypa/manylinux_2_28_x86_64
     env:
       PACKAGES_TO_BUILD: ${{ inputs.packages }}
     steps:
@@ -29,12 +27,11 @@ jobs:
           dnf install -y /usr/bin/patch
       - name: Checkout
         uses: actions/checkout@main
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.12
       - name: Build wheels
-        run: python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
+        run: |
+          python3 -m venv wheelbuilder_venv
+          export PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+          wheelbuilder_venv/bin/python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
         uses: actions/upload-artifact@main
         with:
diff --git a/.github/workflows/build-macos-aarch64-wheels.yml b/.github/workflows/build-macos-aarch64-wheels.yml
index 7275d62b62..08e8048541 100644
--- a/.github/workflows/build-macos-aarch64-wheels.yml
+++ b/.github/workflows/build-macos-aarch64-wheels.yml
@@ -1,4 +1,4 @@
-name: build-macos-amd64-wheels
+name: build-macos-aarch64-wheels
 'on':
   workflow_dispatch:
     inputs:
@@ -12,7 +12,7 @@ name: build-macos-amd64-wheels
         required: true
 jobs:
   build_wheels:
-    runs-on: macos-12
+    runs-on: macos-latest
     env:
       PACKAGES_TO_BUILD: ${{ inputs.packages }}
     steps:
@@ -23,7 +23,9 @@ jobs:
         with:
           python-version: 3.12
       - name: Build wheels
-        run: python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
+        run: |
+          export PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+          python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
         uses: actions/upload-artifact@main
         with:
diff --git a/.github/workflows/build-macos-amd64-wheels.yml b/.github/workflows/build-macos-amd64-wheels.yml
index 7275d62b62..3382d5f163 100644
--- a/.github/workflows/build-macos-amd64-wheels.yml
+++ b/.github/workflows/build-macos-amd64-wheels.yml
@@ -23,7 +23,9 @@ jobs:
         with:
           python-version: 3.12
       - name: Build wheels
-        run: python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
+        run: |
+          export PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+          python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
         uses: actions/upload-artifact@main
         with:
diff --git a/.github/workflows/build-windows-amd64-wheels.yml b/.github/workflows/build-windows-amd64-wheels.yml
index 0544499e65..8563dcb7de 100644
--- a/.github/workflows/build-windows-amd64-wheels.yml
+++ b/.github/workflows/build-windows-amd64-wheels.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Build wheels
         run: |
           $env:PATH+=";C:\Program Files\Git\usr\bin"
+          $env:PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
           python3 scripts/wheelbuilder/build_wheels.py ${{ inputs.graalpy_url }}
       - name: Store wheels
         uses: actions/upload-artifact@main