diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9eb68181..cc430ccb 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 16]
+        java: ['8', '11', '16']
     steps:
     - uses: actions/checkout@v2
     - name: Cache local Maven repository
@@ -27,15 +27,19 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-${{ matrix.java }}-maven-
     - name: Set up build JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 16
+        distribution: 'zulu'
+        java-version: '16'
+        check-latest: true
     - name: Build with Maven
       run: mvn -B -DskipTests=true package --file pom.xml
     - name: Set up test JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java }}
+        check-latest: true
     - name: Test with Maven
       run: mvn -B -P coverage verify -Denforcer.skip=true -DskipITs=false --file pom.xml
     - uses: actions/upload-artifact@v2