diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index e95898097..29278e183 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -202,6 +202,12 @@ jobs:
                   --ccache "$CCACHE_SIZE" $NO_CLIENT
           .ci/name_build.sh
 
+      - name: Delete stale ccache
+        if: github.ref == 'refs/heads/master'
+        env:
+          GH_TOKEN: ${{github.token}}
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master'
         uses: actions/cache/save@v5
@@ -443,14 +449,18 @@ jobs:
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
         run: .ci/compile.sh --server --test --vcpkg
 
+      - name: Delete stale ccache
+        if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
+        env:
+          GH_TOKEN: ${{github.token}}
+        run: gh cache delete "${{ steps.ccache_restore.outputs.cache-primary-key }}" || true
+
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
         uses: actions/cache/save@v5
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         with:
           path: ${{env.CCACHE_DIR}}
-          key: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}-${{env.BRANCH_NAME}}
+          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
 
       - name: Sign app bundle
         if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)