diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml
index f42d68702..a71b1af94 100644
--- a/.github/workflows/build-only.yml
+++ b/.github/workflows/build-only.yml
@@ -14,19 +14,10 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-          cache: gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@d9336dac04dea2507a617466bc058a3def92b18b
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
       - name: Build with Gradle
         run: ./gradlew assemble -PbuildProfile=java11
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
-          rm -fr ~/.gradle/caches/*/plugin-resolution/
-          find ~/.gradle/caches/ -name "*.lock" -type f -delete
       - name: build artifact
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 3dd5a477e..fe74c5ded 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -19,19 +19,10 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-          cache: gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@d9336dac04dea2507a617466bc058a3def92b18b
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
       - name: Build with Gradle
         run: ./gradlew test -PbuildProfile=java11 -Ptest.dbondocker=true -Ptest.db.dir=/firebird/data
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
-          rm -fr ~/.gradle/caches/*/plugin-resolution/
-          find ~/.gradle/caches/ -name "*.lock" -type f -delete
       - name: Store Report Artifact
         uses: actions/upload-artifact@v4
         if: always()