diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index 603470f3..4a01f028 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -42,8 +42,11 @@ jobs:
         path: |
           ~/.gradle/caches
           ~/.gradle/wrapper
-        key: gradle-${{ hashFiles('**/*.gradle.kts') }}
-        restore-keys: gradle-
+        key: gradle-core-${{ hashFiles('**/*.gradle.kts') }}
+        restore-keys: |
+          gradle-manager-${{ hashFiles('**/*.gradle.kts') }}
+          gradle-core
+          gradle-
     - name: Build with Gradle
       run:  |
         echo 'org.gradle.caching=true' >> gradle.properties
diff --git a/.github/workflows/manager.yml b/.github/workflows/manager.yml
index 51ab9918..124ab16a 100644
--- a/.github/workflows/manager.yml
+++ b/.github/workflows/manager.yml
@@ -41,8 +41,11 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-${{ hashFiles('**/*.gradle.kts') }}
-          restore-keys: gradle-
+          key: gradle-manager-${{ hashFiles('**/*.gradle.kts') }}
+          restore-keys: |
+            gradle-core-${{ hashFiles('**/*.gradle.kts') }}
+            gradle-manager
+            gradle-
       - name: Build with Gradle
         id: buildRelease
         run: |