diff --git a/dataflow/gpu-workers/cloudbuild.yaml b/dataflow/gpu-workers/cloudbuild.yaml
index 8ff64e1a639..dec3d7aabb8 100644
--- a/dataflow/gpu-workers/cloudbuild.yaml
+++ b/dataflow/gpu-workers/cloudbuild.yaml
@@ -22,14 +22,14 @@ steps:
     args:
       [ 'build'
       , '--build-arg=python_version=$_PYTHON_VERSION'
-      , '--tag=gcr.io/$PROJECT_ID/$_IMAGE_TAG'
+      , '--tag=gcr.io/$PROJECT_ID/$_IMAGE'
       , '.'
       ]
 
   # Push the image to Container Registry.
   - name: gcr.io/cloud-builders/docker
-    args: [ 'push', 'gcr.io/$PROJECT_ID/$_IMAGE_TAG' ]
+    args: [ 'push', 'gcr.io/$PROJECT_ID/$_IMAGE' ]
 
 substitutions:
   _PYTHON_VERSION: '3.8'
-  _IMAGE_TAG: samples/dataflow/tensorflow-gpu:latest
+  _IMAGE: samples/dataflow/tensorflow-gpu:latest
diff --git a/dataflow/gpu-workers/e2e_test.py b/dataflow/gpu-workers/e2e_test.py
index 8914aa9e8c8..f3f105d7b6a 100644
--- a/dataflow/gpu-workers/e2e_test.py
+++ b/dataflow/gpu-workers/e2e_test.py
@@ -56,7 +56,7 @@ def image_name(configure_docker: None) -> str:
     # See the `cloudbuild.yaml` for the configuration for this build.
     substitutions = {
         "_PYTHON_VERSION": platform.python_version(),
-        "_IMAGE_TAG": IMAGE_NAME,
+        "_IMAGE": IMAGE_NAME,
     }
     print(f"-- Cloud build substitutions: {substitutions}")
     subprocess.run(