diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index d36432c1d4d8a..a86ae4fa142db 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -543,6 +543,8 @@ class BeamModulePlugin implements Plugin<Project> {
     project.apply plugin: "com.dorongold.task-tree"
     project.taskTree { noRepeat = true }
 
+    project.ext.currentJavaVersion = getSupportedJavaVersion()
+
     project.ext.allFlinkVersions = project.flink_versions.split(',')
     project.ext.latestFlinkVersion = project.ext.allFlinkVersions.last()
 
diff --git a/sdks/go/examples/kafka/taxi.go b/sdks/go/examples/kafka/taxi.go
index 6f4532dad93eb..fe36dd4abdecc 100644
--- a/sdks/go/examples/kafka/taxi.go
+++ b/sdks/go/examples/kafka/taxi.go
@@ -91,8 +91,8 @@
 // Docker Hub.
 //
 //	export DOCKER_ROOT="Your Docker Repository Root"
-//	./gradlew :sdks:java:container:java8:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
-//	docker push $DOCKER_ROOT/beam_java8_sdk:latest
+//	./gradlew :sdks:java:container:java11:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
+//	docker push $DOCKER_ROOT/beam_java11_sdk:latest
 //
 // For runners in local mode, simply building the container using the default
 // values for docker-repository-root and docker-tag will work to have it
@@ -102,7 +102,7 @@
 // pipeline with the --sdk_harness_container_image_override flag for Java, or
 // --environment_config flag for Go. For example:
 //
-//	--sdk_harness_container_image_override=".*java.*,${DOCKER_ROOT}/beam_java8_sdk:latest" \
+//	--sdk_harness_container_image_override=".*java.*,${DOCKER_ROOT}/beam_java11_sdk:latest" \
 //	--environment_config=${DOCKER_ROOT}/beam_go_sdk:latest
 package main
 
diff --git a/sdks/go/examples/xlang/bigquery/wordcount.go b/sdks/go/examples/xlang/bigquery/wordcount.go
index b836efdca4946..83fab1ae36d0c 100644
--- a/sdks/go/examples/xlang/bigquery/wordcount.go
+++ b/sdks/go/examples/xlang/bigquery/wordcount.go
@@ -76,8 +76,8 @@
 // container repository, such as Docker Hub.
 //
 //	export DOCKER_ROOT="Your Docker Repository Root"
-//	./gradlew :sdks:java:container:java8:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
-//	docker push $DOCKER_ROOT/beam_java8_sdk:latest
+//	./gradlew :sdks:java:container:java11:docker -Pdocker-repository-root=$DOCKER_ROOT -Pdocker-tag=latest
+//	docker push $DOCKER_ROOT/beam_java11_sdk:latest
 //
 // For runners in local mode, simply building the container using the default values for
 // docker-repository-root and docker-tag will work to have it accessible locally.
@@ -86,7 +86,7 @@
 // --sdk_harness_container_image_override flag for Java, or --environment_config flag for Go. For
 // example:
 //
-//	--sdk_harness_container_image_override=".*java.*,${DOCKER_ROOT}/beam_java8_sdk:latest" \
+//	--sdk_harness_container_image_override=".*java.*,${DOCKER_ROOT}/beam_java11_sdk:latest" \
 //	--environment_config=${DOCKER_ROOT}/beam_go_sdk:latest
 package main
 
diff --git a/sdks/go/test/build.gradle b/sdks/go/test/build.gradle
index 5b39cf81400f8..7a4c0a63aa48a 100644
--- a/sdks/go/test/build.gradle
+++ b/sdks/go/test/build.gradle
@@ -69,7 +69,7 @@ task flinkValidatesRunner {
 
   dependsOn ":sdks:go:test:goBuild"
   dependsOn ":sdks:go:container:docker"
-  dependsOn ":sdks:java:container:java8:docker"
+  dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
   dependsOn ":runners:flink:${project.ext.latestFlinkVersion}:job-server:shadowJar"
   dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
   doLast {
@@ -93,7 +93,7 @@ task flinkValidatesRunner {
 task samzaValidatesRunner {
   dependsOn ":sdks:go:test:goBuild"
   dependsOn ":sdks:go:container:docker"
-  dependsOn ":sdks:java:container:java8:docker"
+  dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
   dependsOn ":runners:samza:job-server:shadowJar"
   dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
   doLast {
@@ -118,7 +118,7 @@ task sparkValidatesRunner {
   group = "Verification"
 
   dependsOn ":sdks:go:test:goBuild"
-  dependsOn ":sdks:java:container:java8:docker"
+  dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
   dependsOn ":runners:spark:3:job-server:shadowJar"
   dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
   doLast {
@@ -149,7 +149,7 @@ tasks.register("ulrValidatesRunner") {
 
   dependsOn ":sdks:go:test:goBuild"
   dependsOn ":sdks:go:container:docker"
-  dependsOn ":sdks:java:container:java8:docker"
+  dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
   dependsOn "setupVirtualenv"
   dependsOn ":sdks:python:buildPython"
   dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
@@ -180,7 +180,7 @@ task prismValidatesRunner {
 
   dependsOn ":sdks:go:test:goBuild"
   dependsOn ":sdks:go:container:docker"
-  dependsOn ":sdks:java:container:java8:docker"
+  dependsOn ":sdks:java:container:${project.ext.currentJavaVersion}:docker"
   dependsOn ":sdks:java:testing:expansion-service:buildTestExpansionServiceJar"
   doLast {
     def pipelineOptions = [  // Pipeline options piped directly to Go SDK flags.