diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 518a83c53..f4763bdb9 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -36,7 +36,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ env.TAG }}
-      - uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -46,6 +50,7 @@ jobs:
         id: docker_build_base
         uses: docker/build-push-action@v6
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           file: Dockerfile.base
           push: false
           load: true
@@ -57,8 +62,11 @@ jobs:
         id: docker_build_autoindex
         uses: docker/build-push-action@v6
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           file: Dockerfile.autoindex
           push: true
+          build-contexts: |
+            scip-ruby-base=docker-image://scip-ruby-base:${{ env.PATCH }}
           build-args: |
             BASE_TAG=${{ env.PATCH }}
           tags: |
@@ -70,8 +78,11 @@ jobs:
         id: docker_build_scip_ruby
         uses: docker/build-push-action@v6
         with:
+          builder: ${{ steps.buildx.outputs.name }}
           file: Dockerfile
           push: true
+          build-contexts: |
+            scip-ruby-base=docker-image://scip-ruby-base:${{ env.PATCH }}
           build-args: |
             BASE_TAG=${{ env.PATCH }}
           tags: |