diff --git a/.github/workflows/test-ant.yml b/.github/workflows/test-ant.yml
index 5c0b8aef26..8a94e1c0ab 100644
--- a/.github/workflows/test-ant.yml
+++ b/.github/workflows/test-ant.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # for now verify JDK 8 and 11
-        java: [ 8, 11.0.x ]
+        java: [ '8', '11' ]
 
     name: Java ${{ matrix.java }} build
     steps:
@@ -28,7 +28,9 @@ jobs:
       - name: Setup java ${{ matrix.java }}
         uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
+          check-latest: true
 
       - name: Set up Ant
         id: setup-ant
diff --git a/.github/workflows/test-maven.yml b/.github/workflows/test-maven.yml
index 87c55871ca..75792f5205 100644
--- a/.github/workflows/test-maven.yml
+++ b/.github/workflows/test-maven.yml
@@ -20,7 +20,9 @@ jobs:
     - name: Set up JDK 1.8
       uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
+        check-latest: true
 
     - name: Cache
       uses: actions/cache@v2.1.3