diff --git a/.github/workflows/docker_gcr.yaml b/.github/workflows/docker_gcr.yaml
index e4ade023..caeba95b 100644
--- a/.github/workflows/docker_gcr.yaml
+++ b/.github/workflows/docker_gcr.yaml
@@ -25,12 +25,6 @@ jobs:
             -   name: Set up Docker Buildx
                 uses: docker/setup-buildx-action@v3
 
-            -   name: Cache Docker layers
-                uses: actions/cache@v4
-                with:
-                    path: /tmp/.buildx-cache
-                    key: ${{ runner.os }}-gcr-docker
-
             -   name: Login to GitHub Container Registry
                 uses: docker/login-action@v3
                 with:
@@ -42,13 +36,9 @@ jobs:
                 uses: docker/build-push-action@v5
                 with:
                     context: .
+                    file: Dockerfile
                     push: true
                     tags: ghcr.io/${{ github.repository }}:latest
                     platforms: linux/amd64
-                    cache-from: type=local,src=/tmp/.buildx-cache
-                    cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-            -   name: Move cache
-                run: |
-                    rm -rf /tmp/.buildx-cache
-                    mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+                    cache-from: type=gha,scope=${{ github.workflow }}
+                    cache-to: type=gha,scope=${{ github.workflow }},mode=max
diff --git a/.github/workflows/docker_hub.yaml b/.github/workflows/docker_hub.yaml
index 1da1208c..874ba16e 100644
--- a/.github/workflows/docker_hub.yaml
+++ b/.github/workflows/docker_hub.yaml
@@ -54,7 +54,3 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha,scope=${{ github.workflow }}
           cache-to: type=gha,scope=${{ github.workflow }},mode=max
-
-          # Issue https://github.com/rust-lang/cargo/issues/10583
-          build-args: |
-            CARGO_NET_GIT_FETCH_WITH_CLI=true
diff --git a/Dockerfile b/Dockerfile
index eb8f1f51..ebb548a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,8 +48,9 @@ RUN composer install --no-interaction --no-suggest --no-dev --no-scripts && \
 
 COPY --chown=82:82 . /var/www/packagist/
 
-RUN composer run-script auto-scripts && \
-    mkdir var/composer var/zipball && \
+RUN export COMPOSER_ALLOW_SUPERUSER=1; \
+    composer run-script auto-scripts; \
+    mkdir var/composer var/zipball; \
     rm -rf /root/.composer var/cache
 
 RUN set -eux; \