diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml
index 912aca0e16f9..56ed1115a2d1 100644
--- a/.github/actions/setup-environment-action/action.yml
+++ b/.github/actions/setup-environment-action/action.yml
@@ -48,7 +48,7 @@ runs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: ${{ inputs.java-version == 'default' && '8' || inputs.java-version }}
+        java-version: ${{ inputs.java-version == 'default' && '17' || inputs.java-version }}
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:
diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml
index e4b7643bd2d8..6f15155a115c 100644
--- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml
+++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml
@@ -82,8 +82,7 @@ jobs:
             8
       - name: run jar Java${{ matrix.java_version }} script
         run: |
-          ./gradlew runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar \
-          -Dorg.gradle.java.home=$JAVA_HOME_8_X64
+          ./gradlew runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar
       - name: run validatesRunner Java${{ matrix.java_version }} script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml
index 370a0698fd34..315e7499b55b 100644
--- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml
+++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml
@@ -82,8 +82,7 @@ jobs:
             8
       - name: run jar Java${{ matrix.java_version }} script
         run: |
-          ./gradlew :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar \
-          -Dorg.gradle.java.home=$JAVA_HOME_8_X64
+          ./gradlew :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar
       - name: run validatesRunner Java${{ matrix.java_version }} script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml
index 9133b00218a3..cecd2146be5d 100644
--- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml
+++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml
@@ -80,8 +80,7 @@ jobs:
             8
       - name: run jar Java8 script
         run: |
-          ./gradlew :runners:flink:1.15:jar :runners:flink:1.15:testJar \
-          -Dorg.gradle.java.home=$JAVA_HOME_8_X64
+          ./gradlew :runners:flink:1.15:jar :runners:flink:1.15:testJar
       - name: run validatesRunner Java11 script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml
index 40fc60fea644..1d2f5798916b 100644
--- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml
+++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml
@@ -80,8 +80,7 @@ jobs:
             8
       - name: run jar Java8 script
         run: |
-          ./gradlew :runners:spark:3:jar :runners:spark:3:testJar \
-          -Dorg.gradle.java.home=$JAVA_HOME_8_X64
+          ./gradlew :runners:spark:3:jar :runners:spark:3:testJar
       - name: run validatesRunner Java11 script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with: