diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a331222ed2..43a15e1472 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,11 +22,16 @@ jobs:
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
 
     steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.8.0
+        with:
+          access_token: ${{ github.token }}
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: 'Cache local Maven repository'
         uses: actions/cache@v2
         with:
@@ -46,9 +51,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
           server-id: google-snapshots
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD