diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96bf96185a..b164c14075 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,15 +19,9 @@ jobs:
     - name: Set up JDK for build and test
       if: matrix.jdk != 17 
       uses: actions/setup-java@v1
-      with:
-        java-version: ${{ matrix.jdk }}
-
-    - name: Set up build for JDK17 to use JKD11
-      if: matrix.jdk == 17 
-      uses: actions/setup-java@v2
       with:
         distribution: temurin # Temurin is a distribution of adoptium
-        java-version: 11
+        java-version: ${{ matrix.jdk }}
 
     - name: Checkout security
       uses: actions/checkout@v2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 549d84424d..2e6e5897b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists