diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index dfa84b131..a6b70a52d 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 18000s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -16,3 +15,4 @@ substitutions:
   _GIT_TAG: "12345"
   _PULL_BASE_REF: main
   _PULL_BASE_SHA: "12345"
+timeout: 1800s
diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
index 319aedb3d..dc5dc71a5 100644
--- a/images/cfssl/cloudbuild.yaml
+++ b/images/cfssl/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 600s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml
index e11e5ed8d..0a2e2067c 100644
--- a/images/custom-error-pages/cloudbuild.yaml
+++ b/images/custom-error-pages/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 1800s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -9,3 +8,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=custom-error-pages push
+timeout: 3600s
diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/ext-auth-example-authsvc/cloudbuild.yaml
index c220bc1d8..ef8d569dd 100644
--- a/images/ext-auth-example-authsvc/cloudbuild.yaml
+++ b/images/ext-auth-example-authsvc/cloudbuild.yaml
@@ -1,8 +1,5 @@
-timeout: 1200s
 options:
   substitution_option: ALLOW_LOOSE
-  # Increase machine type for multi-arch builds.
-  machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:
diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml
index cb8aac647..24a23018c 100644
--- a/images/fastcgi-helloserver/cloudbuild.yaml
+++ b/images/fastcgi-helloserver/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 1800s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -9,3 +8,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=fastcgi-helloserver push
+timeout: 3600s
diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml
index 499d331b0..257725e61 100644
--- a/images/go-grpc-greeter-server/cloudbuild.yaml
+++ b/images/go-grpc-greeter-server/cloudbuild.yaml
@@ -1,8 +1,5 @@
-timeout: 1200s
 options:
   substitution_option: ALLOW_LOOSE
-  # Increase machine type for multi-arch builds.
-  machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:
diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml
index cb4979ab7..5ec59df8f 100644
--- a/images/httpbun/cloudbuild.yaml
+++ b/images/httpbun/cloudbuild.yaml
@@ -1,8 +1,5 @@
-timeout: 1200s
 options:
   substitution_option: ALLOW_LOOSE
-  # Increase machine type for multi-arch builds.
-  machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:
@@ -11,3 +8,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=httpbun push
+timeout: 3600s
diff --git a/images/kube-webhook-certgen/cloudbuild.yaml b/images/kube-webhook-certgen/cloudbuild.yaml
index ea1f0f93e..5f48154ee 100644
--- a/images/kube-webhook-certgen/cloudbuild.yaml
+++ b/images/kube-webhook-certgen/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 10800s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -9,3 +8,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images && make NAME=kube-webhook-certgen push
+timeout: 1800s
diff --git a/images/nginx-1.25/cloudbuild.yaml b/images/nginx-1.25/cloudbuild.yaml
index 51038e3c4..4dc8ab2dc 100644
--- a/images/nginx-1.25/cloudbuild.yaml
+++ b/images/nginx-1.25/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 10800s
 options:
   substitution_option: ALLOW_LOOSE
   # Increase machine type for multi-arch builds.
@@ -11,3 +10,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images/nginx-1.25 && make push
+timeout: 7200s
diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
index a9040c06a..687f76228 100644
--- a/images/nginx/cloudbuild.yaml
+++ b/images/nginx/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 10800s
 options:
   substitution_option: ALLOW_LOOSE
   # Increase machine type for multi-arch builds.
@@ -11,3 +10,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images/nginx && make push
+timeout: 7200s
diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml
index fbf0772f5..4cf071c09 100644
--- a/images/opentelemetry/cloudbuild.yaml
+++ b/images/opentelemetry/cloudbuild.yaml
@@ -1,8 +1,7 @@
-timeout: 10800s
 options:
   substitution_option: ALLOW_LOOSE
   # Increase machine type for multi-arch builds.
-  machineType: E2_HIGHCPU_32
+  machineType: E2_HIGHCPU_8
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:
@@ -11,3 +10,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images/opentelemetry && make NGINX_VERSION=1.21.6 push && make NGINX_VERSION=1.25.3 push
+timeout: 3600s
diff --git a/images/test-runner/cloudbuild.yaml b/images/test-runner/cloudbuild.yaml
index 4c06ace49..b09800c90 100644
--- a/images/test-runner/cloudbuild.yaml
+++ b/images/test-runner/cloudbuild.yaml
@@ -1,4 +1,3 @@
-timeout: 3600s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
@@ -9,3 +8,4 @@ steps:
     args:
       - -c
       - gcloud auth configure-docker && cd images/test-runner && make push
+timeout: 1800s