diff --git a/.github/trigger_files/beam_PostCommit_XVR_GoUsingJava_Dataflow.json b/.github/trigger_files/beam_PostCommit_XVR_GoUsingJava_Dataflow.json
index 920c8d132e4a..8784d0786c02 100644
--- a/.github/trigger_files/beam_PostCommit_XVR_GoUsingJava_Dataflow.json
+++ b/.github/trigger_files/beam_PostCommit_XVR_GoUsingJava_Dataflow.json
@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "modification": 1
+  "modification": 2
 }
\ No newline at end of file
diff --git a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml
index 1ce6d369c216..36ce0cef8d0d 100644
--- a/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml
+++ b/.github/workflows/beam_PostCommit_XVR_GoUsingJava_Dataflow.yml
@@ -77,11 +77,6 @@ jobs:
         uses: ./.github/actions/setup-environment-action
         with:
           python-version: default
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: GCloud Docker credential helper
-        run: |
-          gcloud auth configure-docker us.gcr.io
       - name: run XVR GoUsingJava Dataflow script
         env:
           USER: github-actions
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 05cb8417106d..64781d284815 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -400,6 +400,14 @@ def buildAndPushDockerPythonContainer = tasks.create("buildAndPushDockerPythonCo
           name: "${project.docker_image_default_repo_prefix}python${pythonVer}_sdk",
           root: "apache",
           tag: project.sdk_version)
+  doFirst {
+    exec {
+      commandLine "docker", "pull", "gcr.io/apache-beam-testing/beam-sdk/beam_python${pythonVer}_sdk:${project.sdk_version}"
+    }
+    exec {
+      commandLine "docker", "tag", "gcr.io/apache-beam-testing/beam-sdk/beam_python${pythonVer}_sdk:${project.sdk_version}", defaultDockerImageName
+    }
+  }
   doLast {
     exec {
       commandLine "docker", "tag", "${defaultDockerImageName}", "${dockerPythonImageName}"