diff --git a/syz-cluster/Makefile b/syz-cluster/Makefile
index 09714d1e4e3d..9fb3afd86f50 100644
--- a/syz-cluster/Makefile
+++ b/syz-cluster/Makefile
@@ -31,7 +31,7 @@ $(eval $(call build_image_rules,./workflow/boot-step,boot-step))
 $(eval $(call build_image_rules,./tools/db-mgmt,db-mgmt))
 $(eval $(call build_image_rules,./tools/send-test-email,send-test-email))
 
-IMAGES := controller web-dashboard reporter-server series-tracker db-mgmt triage-step build-step boot-step fuzz-step send-test-email
+IMAGES := controller web-dashboard reporter-server series-tracker db-mgmt triage-step build-step boot-step fuzz-step send-test-email email-reporter
 BUILD_TARGETS := $(addprefix build-, $(IMAGES))
 PUSH_TARGETS := $(addprefix push-, $(IMAGES))
 
@@ -95,8 +95,11 @@ SED_EXPRESSIONS := \
 k8s-config-dev:
 	@kubectl kustomize ./overlays/minikube/ | sed $(SED_EXPRESSIONS)
 
-k8s-config-gke: ensure-spanner-database-uri-env ensure-blob-storage-env ensure-workflow-artifacts-bucket
-	@kubectl kustomize ./overlays/gke/ | sed $(SED_EXPRESSIONS)
+k8s-config-gke-prod: ensure-spanner-database-uri-env ensure-blob-storage-env ensure-workflow-artifacts-bucket
+	@kubectl kustomize ./overlays/gke/prod/ | sed $(SED_EXPRESSIONS)
+
+k8s-config-gke-staging: ensure-spanner-database-uri-env ensure-blob-storage-env ensure-workflow-artifacts-bucket
+	@kubectl kustomize ./overlays/gke/staging/ | sed $(SED_EXPRESSIONS)
 
 migrate-job.yaml:
 	@cat tools/db-mgmt/migrate-job.yaml | sed $(SED_EXPRESSIONS)
diff --git a/syz-cluster/email-reporter/Dockerfile b/syz-cluster/email-reporter/Dockerfile
index 49ab103aa9cd..c90449e206a4 100644
--- a/syz-cluster/email-reporter/Dockerfile
+++ b/syz-cluster/email-reporter/Dockerfile
@@ -6,10 +6,9 @@ WORKDIR /build
 COPY go.mod ./
 COPY go.sum ./
 RUN go mod download
-COPY pkg/auth/ pkg/auth/
-COPY pkg/gcs/ pkg/gcs/
-COPY pkg/gce/ pkg/gce/
-COPY pkg/email/ pkg/email/
+COPY pkg/ pkg/
+COPY prog/ prog/
+COPY sys/targets/ sys/targets/
 COPY dashboard/dashapi/ dashboard/dashapi/
 
 # Build the tool.
diff --git a/syz-cluster/overlays/gke/global-config-env.yaml b/syz-cluster/overlays/gke/common/global-config-env.yaml
similarity index 100%
rename from syz-cluster/overlays/gke/global-config-env.yaml
rename to syz-cluster/overlays/gke/common/global-config-env.yaml
diff --git a/syz-cluster/overlays/gke/kernel-disk-pvc.yaml b/syz-cluster/overlays/gke/common/kernel-disk-pvc.yaml
similarity index 100%
rename from syz-cluster/overlays/gke/kernel-disk-pvc.yaml
rename to syz-cluster/overlays/gke/common/kernel-disk-pvc.yaml
diff --git a/syz-cluster/overlays/gke/kustomization.yaml b/syz-cluster/overlays/gke/common/kustomization.yaml
similarity index 96%
rename from syz-cluster/overlays/gke/kustomization.yaml
rename to syz-cluster/overlays/gke/common/kustomization.yaml
index 825e158038c7..04b0f42947d4 100644
--- a/syz-cluster/overlays/gke/kustomization.yaml
+++ b/syz-cluster/overlays/gke/common/kustomization.yaml
@@ -2,8 +2,7 @@
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 resources:
-  - ../common
-  - global-config.yaml
+  - ../../common
   - global-config-env.yaml
   - kernel-disk-pvc.yaml
   - workflow-artifacts.yaml
diff --git a/syz-cluster/overlays/gke/workflow-artifacts.yaml b/syz-cluster/overlays/gke/common/workflow-artifacts.yaml
similarity index 100%
rename from syz-cluster/overlays/gke/workflow-artifacts.yaml
rename to syz-cluster/overlays/gke/common/workflow-artifacts.yaml
diff --git a/syz-cluster/overlays/gke/global-config.yaml b/syz-cluster/overlays/gke/prod/global-config.yaml
similarity index 96%
rename from syz-cluster/overlays/gke/global-config.yaml
rename to syz-cluster/overlays/gke/prod/global-config.yaml
index 7f2c4ae0570d..3b9e5e24b425 100644
--- a/syz-cluster/overlays/gke/global-config.yaml
+++ b/syz-cluster/overlays/gke/prod/global-config.yaml
@@ -7,7 +7,7 @@ metadata:
   name: global-config
 data:
   config.yaml: |
-    parallelWorkflows: 5
+    parallelWorkflows: 7
     loreArchives:
       - netdev
       - linux-ext4
diff --git a/syz-cluster/overlays/gke/prod/kustomization.yaml b/syz-cluster/overlays/gke/prod/kustomization.yaml
new file mode 100644
index 000000000000..5226a2446eeb
--- /dev/null
+++ b/syz-cluster/overlays/gke/prod/kustomization.yaml
@@ -0,0 +1,7 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+resources:
+  - ../common
+  - global-config.yaml
+  - ../../../email-reporter
diff --git a/syz-cluster/overlays/gke/staging/global-config.yaml b/syz-cluster/overlays/gke/staging/global-config.yaml
new file mode 100644
index 000000000000..d9ed497f7ff7
--- /dev/null
+++ b/syz-cluster/overlays/gke/staging/global-config.yaml
@@ -0,0 +1,13 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: global-config
+data:
+  config.yaml: |
+    parallelWorkflows: 3
+    loreArchives:
+      - netdev
+      - linux-ext4
diff --git a/syz-cluster/overlays/gke/staging/kustomization.yaml b/syz-cluster/overlays/gke/staging/kustomization.yaml
new file mode 100644
index 000000000000..3cc6ada50014
--- /dev/null
+++ b/syz-cluster/overlays/gke/staging/kustomization.yaml
@@ -0,0 +1,6 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+resources:
+  - ../common
+  - global-config.yaml