diff --git a/.github/actions/setup-nix/action.yaml b/.github/actions/setup-nix/action.yaml
index 9bdd094af..c8de447d3 100644
--- a/.github/actions/setup-nix/action.yaml
+++ b/.github/actions/setup-nix/action.yaml
@@ -22,7 +22,9 @@ runs:
       with:
         key: cache-nix-${{ runner.os }}-id-${{ inputs.cache-id }}-${{ hashFiles('nix/**/*.nix', '.github/actions/setup-nix/*') }}
         restore-keys: |
-          cache-nix-${{ runner.os }}-common-
+          cache-nix-${{ runner.os }}-id-${{ inputs.cache-id }}-
+          cache-nix-${{ runner.os }}-id-common-
+          cache-nix-${{ runner.os }}-
     - uses: cachix/cachix-action@v14
       with:
         name: postgrest
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 87cdc6c1a..a8b8ab357 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -98,8 +98,6 @@ jobs:
         uses: ./.github/actions/setup-nix
         with:
           tools: tests withTools
-          # It seems like they are installing the same set of derivations, so we can assign them the same cache id. 
-          # This would decrease the amount of caches dowloaded on merge cache step and will prevent disk space issues.
           cache-id: common 
 
       - name: Run spec tests
@@ -202,6 +200,8 @@ jobs:
         with:
           path: ${{ matrix.cache }}
           key: cache-stack-${{ runner.os }}-${{ hashFiles('stack.yaml.lock') }}
+          restore-keys: |
+            cache-stack-${{ runner.os }}-
       - name: Install dependencies
         if: ${{ matrix.deps }}
         run: ${{ matrix.deps }}