diff --git a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
index df87c8cf05ec..894fe7d1b510 100644
--- a/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
+++ b/.github/workflows/beam_PostCommit_Java_Examples_Dataflow_V2.yml
@@ -79,6 +79,10 @@ jobs:
         with:
             gradle-command: :runners:google-cloud-dataflow-java:examplesJavaRunnerV2IntegrationTest
             max-workers: 12
+      - name: Setup Java 17 environment
+        uses: ./.github/actions/setup-environment-action
+        with:
+          java-version: 17
       - name: run PostCommit Java Distroless Examples Dataflow V2 script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
diff --git a/sdks/python/test-suites/dataflow/common.gradle b/sdks/python/test-suites/dataflow/common.gradle
index 0b02baa53488..89567391a674 100644
--- a/sdks/python/test-suites/dataflow/common.gradle
+++ b/sdks/python/test-suites/dataflow/common.gradle
@@ -381,22 +381,7 @@ task validatesContainer() {
 }
 
 task validatesDistrolessContainer() {
-  def pyversion = "${project.ext.pythonVersion.replace('.', '')}"
-  dependsOn ":sdks:python:container:distroless:py${pyversion}:dockerPush"
-
-  def name = project.docker_image_default_repo_prefix + "python${project.ext.pythonVersion}_sdk_distroless"
-
-  def root = project.rootProject.hasProperty(["docker-repository-root"]) ?
-    project.rootProject["docker-repository-root"] :
-    project.docker_image_default_repo_root
-
-  def tag = project.rootProject.hasProperty(["docker-tag"]) ?
-    project.rootProject["docker-tag"] : project.sdk_version
-
-  def imageURL = containerImageName(
-        name: name,
-        root: root,
-        tag: tag)
+  def imageURL = "gcr.io/apache-beam-testing/beam-sdk/beam_python${project.ext.pythonVersion}_sdk_distroless:${project.sdk_version}"
 
   doLast {
     exec {