diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 5e35f5b89..83c82a186 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -53,9 +53,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.hunter
-        key: hunter-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('cmake/SetupHunter.cmake') }}
+        key: hunter-${{ runner.os }}-${{ runner.arch }}-${{ matrix.build_type }}-${{ hashFiles('cmake/SetupHunter.cmake') }}
         restore-keys: |
-          hunter-${{ runner.os }}-${{ runner.arch }}-
+          hunter-${{ runner.os }}-${{ runner.arch }}-${{ matrix.build_type }}-
 
     - name: Cache ccache
       uses: actions/cache@v4
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 2c66fd21d..857ef341e 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -42,9 +42,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: C:/.hunter
-        key: hunter-${{ runner.os }}-${{ hashFiles('cmake/SetupHunter.cmake') }}
+        key: hunter-${{ runner.os }}-${{ matrix.build_type }}-${{ hashFiles('cmake/SetupHunter.cmake') }}
         restore-keys: |
-          hunter-${{ runner.os }}-
+          hunter-${{ runner.os }}-${{ matrix.build_type }}-
 
     - name: Cache sccache
       uses: actions/cache@v4