diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/e2e-test-echo/cloudbuild.yaml
similarity index 92%
rename from images/ext-auth-example-authsvc/cloudbuild.yaml
rename to images/e2e-test-echo/cloudbuild.yaml
index 09535a5a6..dc6e1dcf0 100644
--- a/images/ext-auth-example-authsvc/cloudbuild.yaml
+++ b/images/e2e-test-echo/cloudbuild.yaml
@@ -8,4 +8,4 @@ steps:
     entrypoint: bash
     args:
       - -c
-      - gcloud auth configure-docker && cd images && make NAME=ext-auth-example-authsvc push
+      - gcloud auth configure-docker && cd images && make NAME=e2e-test-echo push
diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml
deleted file mode 100644
index 44e0bef8b..000000000
--- a/images/go-grpc-greeter-server/cloudbuild.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-options:
-  # Ignore Prow provided substitutions.
-  substitution_option: ALLOW_LOOSE
-steps:
-  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    env:
-      - REGISTRY=gcr.io/k8s-staging-ingress-nginx
-    entrypoint: bash
-    args:
-      - -c
-      - gcloud auth configure-docker && cd images && make NAME=go-grpc-greeter-server push