diff --git a/.github/workflows/master-snapshot-release.yml b/.github/workflows/master-snapshot-release.yml
index 8c1d1d0049..1fb5ac7e2e 100644
--- a/.github/workflows/master-snapshot-release.yml
+++ b/.github/workflows/master-snapshot-release.yml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 16]
-        distribution: [temurin, adopt-openj9]
+        java: [ 11, 17 ]
+        distribution: [ temurin ]
         kubernetes: [ 'v1.17.13','v1.18.20','v1.19.14','v1.20.10','v1.21.4', 'v1.22.1' ]
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2f031c070e..c0f90aca41 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11 ]
-        distribution: [ temurin, adopt-openj9 ]
+        java: [ 11, 17 ]
+        distribution: [ temurin ]
         kubernetes: [ 'v1.17.13','v1.18.20','v1.19.14','v1.20.10','v1.21.4', 'v1.22.1' ]
     steps:
       - uses: actions/checkout@v2