diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index baf48763..22f17fb7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -150,20 +150,6 @@ jobs:
         run: |
           echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}${{ vars.QUAY_REPO }}" | tee -a "${GITHUB_ENV}"
 
-      - name: Configure build cache from/to
-        shell: bash
-        run: |
-          #
-          # Check if there is a GitHub Container Registry Login and use it for caching
-          if [[ -n "${HAVE_GHCR_LOGIN}" ]]; then
-            echo "BAKE_CACHE_FROM=type=registry,ref=${{ vars.GHCR_REPO }}-buildcache:${{ matrix.base_image }}" | tee -a "${GITHUB_ENV}"
-            echo "BAKE_CACHE_TO=type=registry,ref=${{ vars.GHCR_REPO }}-buildcache:${{ matrix.base_image }},mode=max" | tee -a "${GITHUB_ENV}"
-          else
-            echo "BAKE_CACHE_FROM="
-            echo "BAKE_CACHE_TO="
-          fi
-          #
-
       - name: Add localhost registry
         if: ${{ matrix.base_image == 'alpine' }}
         shell: bash
@@ -184,8 +170,8 @@ jobs:
           files: docker/docker-bake.hcl
           targets: "${{ matrix.base_image }}-multi"
           set: |
-            *.cache-from=${{ env.BAKE_CACHE_FROM }}
-            *.cache-to=${{ env.BAKE_CACHE_TO }}
+            *.cache-from=type=gha,scope=${{ matrix.base_image }}
+            *.cache-to=type=gha,scope=${{ matrix.base_image }},mode=max
 
 
       # Extract the Alpine binaries from the containers
diff --git a/.github/workflows/releasecache-cleanup.yml b/.github/workflows/releasecache-cleanup.yml
deleted file mode 100644
index 572330c4..00000000
--- a/.github/workflows/releasecache-cleanup.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
-  workflow_dispatch:
-    inputs:
-      manual_trigger:
-        description: "Manual trigger buildcache cleanup"
-        required: false
-        default: ""
-
-  schedule:
-    - cron: '0 1 * * FRI'
-
-name: Cleanup
-jobs:
-  releasecache-cleanup:
-    name: Releasecache Cleanup
-    runs-on: ubuntu-22.04
-    continue-on-error: true
-    timeout-minutes: 30
-    steps:
-      - name: Delete vaultwarden-buildcache containers
-        uses: actions/delete-package-versions@e5bc658cc4c965c472efe991f8beea3981499c55 # v5.0.0
-        with:
-          package-name: 'vaultwarden-buildcache'
-          package-type: 'container'
-          min-versions-to-keep: 0
-          delete-only-untagged-versions: 'false'