diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8781cc27d..5442f638f 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -35,11 +35,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 21]
-        include:
-          - os: ubuntu-latest
-            java: 17
-            codecov: yes
+        java: [11, 17, 21]
     name: Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -63,10 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 21]
-        include:
-          - os: ubuntu-latest
-            java: 17
+        java: [11, 17, 21]
     name: Integ Test JDK${{ matrix.java }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -80,6 +73,6 @@ jobs:
         run: |
           ./gradlew integTest yamlRestTest
       - name: Multi Nodes Integration Testing
-        if: matrix.java == '21'
+        if: matrix.java == '17'
         run: |
           ./gradlew integTest -PnumNodes=3