diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 3b22e07..5502582 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -6,35 +6,31 @@ on:
   pull_request:
     branches: [ master ]
 
-env:
-  GRADLE_CACHE_KEY: ${{ github.run_id }}-gradle-${{ github.run_number }}-${{ github.run_number }}-${{ github.sha }}
-
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [ '8', '11', '17', '21' ]
 
     name: Java ${{ matrix.java }} build
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.java }}
-    - uses: actions/cache@v1
+    - name: Build Java ${{ matrix.java }}
+      uses: gradle/actions/setup-gradle@v3
+      if: matrix.java != 11
       with:
-        path: ~/.gradle/caches
-        key: ${{ env.GRADLE_CACHE_KEY }}
-        restore-keys: ${{ env.GRADLE_CACHE_KEY }}
-    - name: Build Java 8
-      run: chmod +x gradlew && ./gradlew test
-      if: matrix.java == 8
+        arguments: test
     - name: Build Java 11
-      run: chmod +x gradlew && ./gradlew jacocoTestReport coveralls
+      uses: gradle/actions/setup-gradle@v3
+      if: matrix.java == 11
+      with:
+        arguments: jacocoTestReport coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      if: matrix.java != 8