diff --git a/.github/workflows/atlas.yml b/.github/workflows/atlas.yml
index db71e178eb..83a59e0f5e 100644
--- a/.github/workflows/atlas.yml
+++ b/.github/workflows/atlas.yml
@@ -64,7 +64,7 @@ jobs:
           echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
           echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
-      - name: Cache Maven/Gradle Local Caches
+      - name: Cache Maven/Gradle Dependency/Dist Caches
         id: cache-maven
         uses: actions/cache@v4
         # if it's not a pull request, we restore and save the cache
@@ -73,7 +73,7 @@ jobs:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper/
           # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
           # The whole cache is dropped monthly to prevent unlimited growth.
@@ -82,7 +82,7 @@ jobs:
           restore-keys: |
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
-      - name: Restore Maven/Gradle Local Caches
+      - name: Restore Maven/Gradle Dependency/Dist Caches
         uses: actions/cache/restore@v3
         # if it a pull request, we restore the cache but we don't save it
         if: github.event_name == 'pull_request'
@@ -90,7 +90,7 @@ jobs:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper/
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
           restore-keys: |
diff --git a/.github/workflows/contributor-build.yml b/.github/workflows/contributor-build.yml
index 78949914d1..2d06f42c0f 100644
--- a/.github/workflows/contributor-build.yml
+++ b/.github/workflows/contributor-build.yml
@@ -73,7 +73,7 @@ jobs:
           echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
           echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
           echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
-      - name: Cache Maven/Gradle Local Caches
+      - name: Cache Maven/Gradle Dependency/Dist Caches
         id: cache-maven
         uses: actions/cache@v4
         # if it's not a pull request, we restore and save the cache
@@ -82,7 +82,7 @@ jobs:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper/
           # A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
           # The whole cache is dropped monthly to prevent unlimited growth.
@@ -91,7 +91,7 @@ jobs:
           restore-keys: |
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
-      - name: Restore Maven/Gradle Local Caches
+      - name: Restore Maven/Gradle Dependency/Dist Caches
         uses: actions/cache/restore@v3
         # if it a pull request, we restore the cache but we don't save it
         if: github.event_name == 'pull_request'
@@ -99,7 +99,7 @@ jobs:
           path: |
             ~/.m2/repository/
             ~/.m2/wrapper/
-            ~/.gradle/caches/
+            ~/.gradle/caches/modules-2
             ~/.gradle/wrapper/
           key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
           restore-keys: |