diff --git a/.github/actions/docker-build/action.yml b/.github/actions/docker-build/action.yml
index d0875a4d..0e3d0a49 100644
--- a/.github/actions/docker-build/action.yml
+++ b/.github/actions/docker-build/action.yml
@@ -33,5 +33,8 @@ runs:
         context: .
         push: true
         tags: ${{ steps.meta.outputs.tags }}
-        cache-from: type=gha
-        cache-to: ${{ case(inputs.publish == 'true', format('type=registry,ref={0}', steps.meta.outputs.tags), 'type=gha,mode=max') }}
+        cache-from: |
+          type=gha
+          type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+        cache-to: ${{ case(inputs.publish == 'true', format('type=registry,ref=ghcr.io/{0}:buildcache,mode=max', github.repository), 'type=gha,mode=max') }}
+        platforms: linux/amd64
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 60fdfe31..534d8343 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Test Docker build
+      - name: Publish Docker build
         uses: ./.github/actions/docker-build
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}