diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index bd35233..d47b535 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -80,18 +80,22 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build ${{ matrix.target }}
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v3
         with:
           files: |
             ${{ steps.meta.outputs.bake-file }}
             ./docker-bake.hcl
           targets: ${{ matrix.target }}-release
           push: ${{ github.ref == 'refs/heads/main' }}
+          pull: true
           set: |
-            *.cache-from=type=gha,scope=buildx-${{ matrix.target }}
-            *.cache-to=type=gha,mode=max,scope=buildx-${{ matrix.target }}
+            *.cache-from=ghcr.io/cyb3r-jak3/alpine-pypy-cache:${{ matrix.target }}
+            *.cache-to=ghcr.io/cyb3r-jak3/alpine-pypy-cache:${{ matrix.target }}
 
 
+# cache-to: type=gha,mode=max,scope=buildx-alpine-pypy-workflow-builder:${{ env.ALPINE_VERSION }}
+# cache-from: type=gha,scope=buildx-alpine-pypy-workflow-builder:${{ env.ALPINE_VERSION }}
+
   Update-DockerHub:
     runs-on: ubuntu-latest
     name: Update DockerHub Descriptions
diff --git a/docker-bake.hcl b/docker-bake.hcl
index f93c8ee..2e879ab 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -96,7 +96,7 @@ target "python-2_7" {
     platforms = [
         "linux/amd64",
         "linux/arm64",
-        "linux/386"
+        // "linux/386"
     ]
 }
 
diff --git a/export/Dockerfile b/export/Dockerfile
index bbb9979..f7337ec 100644
--- a/export/Dockerfile
+++ b/export/Dockerfile
@@ -41,7 +41,7 @@ RUN set -ex; \
     pypy --version
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 23.2
+ENV PYTHON_PIP_VERSION 20.3.4
 ARG PIP_URL=https://bootstrap.pypa.io/get-pip.py
 RUN set -ex; \
     \