diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 809d35d..a8276dd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,8 @@ jobs:
     permissions:
       contents: read
       packages: write
+    env:
+      IMAGE_NAME: git.maronato.dev/${{ github.repository }}
     steps:
       - # Get the repository's code
         name: Checkout
@@ -45,7 +47,7 @@ jobs:
         with:
           # The container image name needs the custom registry in it.
           # Maybe there is a default env var for this?
-          images: git.maronato.dev/${{ github.repository }}
+          images: ${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -76,8 +78,8 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           # cache-from: type=local,src=/tmp/.buildx-cache
           # cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
       # - # Temp fix
       #   # https://github.com/docker/build-push-action/issues/252
       #   # https://github.com/moby/buildkit/issues/1896