diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 2fc801462..7d63b96e8 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -14,9 +14,7 @@ steps:
       - USER=root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && make release
+      - gcloud auth configure-docker && make release
 substitutions:
   _GIT_TAG: "12345"
   _PULL_BASE_REF: main
diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
index 107afff30..4a99aadfb 100644
--- a/images/cfssl/cloudbuild.yaml
+++ b/images/cfssl/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=cfssl push
+      - 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 a3fb71e41..1c22099e6 100644
--- a/images/custom-error-pages/cloudbuild.yaml
+++ b/images/custom-error-pages/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=custom-error-pages push
+      - 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 270605a59..ec76a174e 100644
--- a/images/ext-auth-example-authsvc/cloudbuild.yaml
+++ b/images/ext-auth-example-authsvc/cloudbuild.yaml
@@ -14,6 +14,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=ext-auth-example-authsvc push
+      - 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 b58486d3a..558244af2 100644
--- a/images/fastcgi-helloserver/cloudbuild.yaml
+++ b/images/fastcgi-helloserver/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=fastcgi-helloserver push
+      - 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 11459cdf4..f2bd1bf59 100644
--- a/images/go-grpc-greeter-server/cloudbuild.yaml
+++ b/images/go-grpc-greeter-server/cloudbuild.yaml
@@ -14,6 +14,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=go-grpc-greeter-server push
+      - 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 26cdb07c5..78e7d050c 100644
--- a/images/httpbun/cloudbuild.yaml
+++ b/images/httpbun/cloudbuild.yaml
@@ -14,6 +14,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=httpbun push
+      - 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 f9f407ba8..e137d8f92 100644
--- a/images/kube-webhook-certgen/cloudbuild.yaml
+++ b/images/kube-webhook-certgen/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images && make NAME=kube-webhook-certgen push
+      - 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 fba8cf7f1..3eea8a73c 100644
--- a/images/nginx-1.25/cloudbuild.yaml
+++ b/images/nginx-1.25/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images/nginx-1.25 && make push
+      - gcloud auth configure-docker && cd images/nginx-1.25 && make push
diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
index 6ee1ff476..7319274fb 100644
--- a/images/nginx/cloudbuild.yaml
+++ b/images/nginx/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images/nginx && make push
+      - gcloud auth configure-docker && cd images/nginx && make push
diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml
index 2ccc71f26..b11cc9a38 100644
--- a/images/opentelemetry/cloudbuild.yaml
+++ b/images/opentelemetry/cloudbuild.yaml
@@ -14,7 +14,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images/opentelemetry && make NGINX_VERSION=1.25.3 push \
-        && make NGINX_VERSION=1.21.6 push
+      - 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 d604ad8d1..f69f2594a 100644
--- a/images/test-runner/cloudbuild.yaml
+++ b/images/test-runner/cloudbuild.yaml
@@ -12,6 +12,4 @@ steps:
       - HOME=/root
     args:
       - -c
-      - |
-        gcloud auth configure-docker \
-        && cd images/test-runner && make push
+      - gcloud auth configure-docker && cd images/test-runner && make push