diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index d0570e60e..dfa84b131 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -3,12 +3,12 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
       - REPO_INFO=https://github.com/kubernetes/ingress-nginx
       - COMMIT_SHA=$_PULL_BASE_SHA
       - BUILD_ID=$BUILD_ID
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && make release
diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
index 6ee192a92..319aedb3d 100644
--- a/images/cfssl/cloudbuild.yaml
+++ b/images/cfssl/cloudbuild.yaml
@@ -3,9 +3,9 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=cfssl push
diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml
index cbe3b7277..e11e5ed8d 100644
--- a/images/custom-error-pages/cloudbuild.yaml
+++ b/images/custom-error-pages/cloudbuild.yaml
@@ -3,9 +3,9 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=custom-error-pages push
diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/ext-auth-example-authsvc/cloudbuild.yaml
index 2d73c501c..c220bc1d8 100644
--- a/images/ext-auth-example-authsvc/cloudbuild.yaml
+++ b/images/ext-auth-example-authsvc/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=ext-auth-example-authsvc push
diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml
index 34a36973a..cb8aac647 100644
--- a/images/fastcgi-helloserver/cloudbuild.yaml
+++ b/images/fastcgi-helloserver/cloudbuild.yaml
@@ -3,9 +3,9 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=fastcgi-helloserver push
diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml
index c2c59e63c..499d331b0 100644
--- a/images/go-grpc-greeter-server/cloudbuild.yaml
+++ b/images/go-grpc-greeter-server/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     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
diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml
index 5aac1bca1..cb4979ab7 100644
--- a/images/httpbun/cloudbuild.yaml
+++ b/images/httpbun/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=httpbun push
diff --git a/images/kube-webhook-certgen/cloudbuild.yaml b/images/kube-webhook-certgen/cloudbuild.yaml
index b6f81dd78..ea1f0f93e 100644
--- a/images/kube-webhook-certgen/cloudbuild.yaml
+++ b/images/kube-webhook-certgen/cloudbuild.yaml
@@ -3,9 +3,9 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=kube-webhook-certgen push
diff --git a/images/nginx-1.25/cloudbuild.yaml b/images/nginx-1.25/cloudbuild.yaml
index 7cc7e8a66..51038e3c4 100644
--- a/images/nginx-1.25/cloudbuild.yaml
+++ b/images/nginx-1.25/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_32
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images/nginx-1.25 && make push
diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
index 3c3098fe0..a9040c06a 100644
--- a/images/nginx/cloudbuild.yaml
+++ b/images/nginx/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_32
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images/nginx && make push
diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml
index 447f85e68..fbf0772f5 100644
--- a/images/opentelemetry/cloudbuild.yaml
+++ b/images/opentelemetry/cloudbuild.yaml
@@ -5,9 +5,9 @@ options:
   machineType: E2_HIGHCPU_32
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images/opentelemetry && make NGINX_VERSION=1.21.6 push && make NGINX_VERSION=1.25.3 push
diff --git a/images/test-runner/cloudbuild.yaml b/images/test-runner/cloudbuild.yaml
index 8f8c487d3..4c06ace49 100644
--- a/images/test-runner/cloudbuild.yaml
+++ b/images/test-runner/cloudbuild.yaml
@@ -3,9 +3,9 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
-    entrypoint: bash
     env:
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
+    entrypoint: bash
     args:
       - -c
       - gcloud auth configure-docker && cd images/test-runner && make push