diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 792d3b5d4..26d98901b 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -159,8 +159,7 @@ jobs:
           workspaces: src-tauri
           cache-all-crates: true
           save-if: ${{ github.ref == 'refs/heads/dev' }}
-          shared-key: autobuild-${{ runner.os }}-${{ matrix.target }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('src-tauri/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**Cargo.lock') }}
 
       - name: Install dependencies (ubuntu only)
         if: matrix.os == 'ubuntu-22.04'
@@ -268,8 +267,7 @@ jobs:
           workspaces: src-tauri
           cache-all-crates: true
           save-if: ${{ github.ref == 'refs/heads/dev' }}
-          shared-key: autobuild-${{ runner.os }}-${{ matrix.target }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('src-tauri/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**Cargo.lock') }}
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -416,8 +414,7 @@ jobs:
           workspaces: src-tauri
           cache-all-crates: true
           save-if: ${{ github.ref == 'refs/heads/dev' }}
-          shared-key: autobuild-${{ runner.os }}-${{ matrix.target }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('src-tauri/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**Cargo.lock') }}
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
diff --git a/.github/workflows/clean-old-assets.yml b/.github/workflows/clean-old-assets.yml
index 4c9ad9f02..c4409d3e6 100644
--- a/.github/workflows/clean-old-assets.yml
+++ b/.github/workflows/clean-old-assets.yml
@@ -56,7 +56,7 @@ jobs:
           echo "🔍 Finding last commit with Tauri-related changes..."
 
           # Define patterns for Tauri-related files
-          TAURI_PATTERNS="src/ src-tauri/src src-tauri/Cargo.toml src-tauri/Cargo.lock src-tauri/tauri.*.conf.json src-tauri/build.rs src-tauri/capabilities"
+          TAURI_PATTERNS="src/ src-tauri/src src-tauri/Cargo.toml Cargo.lock src-tauri/tauri.*.conf.json src-tauri/build.rs src-tauri/capabilities"
 
           # Get the last commit that changed any of these patterns (excluding build artifacts)
           LAST_TAURI_COMMIT=""
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index e5ae26c32..ebe4d231b 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -83,7 +83,7 @@ jobs:
           workspaces: src-tauri
           save-if: false
           cache-all-crates: true
-          shared-key: autobuild-shared
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**Cargo.lock') }}
 
       - name: Install dependencies (ubuntu only)
         if: matrix.os == 'ubuntu-22.04' && github.event.inputs[matrix.input] == 'true'
diff --git a/.github/workflows/lint-clippy.yml b/.github/workflows/lint-clippy.yml
index d7f3416ba..251b326e5 100644
--- a/.github/workflows/lint-clippy.yml
+++ b/.github/workflows/lint-clippy.yml
@@ -61,8 +61,7 @@ jobs:
           workspaces: src-tauri
           cache-all-crates: true
           save-if: false
-          shared-key: autobuild-${{ runner.os }}-${{ matrix.target }}
-          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('src-tauri/Cargo.lock') }}
+          key: ${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('**Cargo.lock') }}
 
       - name: Install dependencies (ubuntu only)
         if: matrix.os == 'ubuntu-22.04'