diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d95604e6f..f8fd0fa9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,17 +26,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache Conan packages
-        id: cache-conan
+      - name: Cache Conan
         uses: actions/cache@v4
-        env:
-          cache-name: cache-conan-packages
         with:
           path: ~/.conan2
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('conanfile.py') }}
+          key: ${{ runner.os }}-conan-${{ matrix.build_type }}-${{ hashFiles('conanfile.py') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
+            ${{ runner.os }}-conan-${{ matrix.build_type }}-
+            ${{ runner.os }}-conan-
             ${{ runner.os }}-
 
       - name: Set up Python
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 6ff985814..43f24de90 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -20,17 +20,14 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Cache Conan packages
-        id: cache-conan
+      - name: Cache Conan
         uses: actions/cache@v4
-        env:
-          cache-name: cache-conan-packages
         with:
           path: ~/.conan2
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('conanfile.py') }}
+          key: ${{ runner.os }}-conan-${{ matrix.build_type }}-${{ hashFiles('conanfile.py') }}
           restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
+            ${{ runner.os }}-conan-${{ matrix.build_type }}-
+            ${{ runner.os }}-conan-
             ${{ runner.os }}-
 
       - name: Set up Python