diff --git a/kubernetes/buildkite/linux-agents-big.yaml b/kubernetes/buildkite/linux-test-big.yaml
similarity index 92%
rename from kubernetes/buildkite/linux-agents-big.yaml
rename to kubernetes/buildkite/linux-test-big.yaml
index 733df15..0aaa799 100644
--- a/kubernetes/buildkite/linux-agents-big.yaml
+++ b/kubernetes/buildkite/linux-test-big.yaml
@@ -15,7 +15,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: test-linux-buildkite
+  name: linux-big
   namespace: buildkite
 spec:
   replicas: 1
@@ -26,11 +26,11 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: test-linux-buildkite
+      app: linux-test-big
   template:
     metadata:
       labels:
-        app: test-linux-buildkite
+        app: linux-test-big
     spec:
       containers:
         - name: buildkite-linux
@@ -58,7 +58,7 @@ spec:
                 fieldRef:
                  fieldPath: metadata.name
             - name: BUILDKITE_AGENT_TAGS
-              value: "queue=linux-test,name=$(POD_NAME),cluster=google"
+              value: "queue=linux-test-big,name=$(POD_NAME),cluster=google"
             - name: BUILDKITE_BUILD_PATH
               value: "/var/lib/buildkite-agent/builds"
             - name: BUILDKITE_API_TOKEN
diff --git a/kubernetes/buildkite/linux-agents-test.yaml b/kubernetes/buildkite/linux-test.yaml
similarity index 90%
rename from kubernetes/buildkite/linux-agents-test.yaml
rename to kubernetes/buildkite/linux-test.yaml
index c3f541a..6e1cbe8 100644
--- a/kubernetes/buildkite/linux-agents-test.yaml
+++ b/kubernetes/buildkite/linux-test.yaml
@@ -15,7 +15,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: buildkite-linux-agents-test
+  name: linux-test
   namespace: buildkite
 spec:
   replicas: 1
@@ -26,22 +26,22 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: linux-agents-test
+      app: linux-test
   template:
     metadata:
       labels:
-        app: linux-agents-test
+        app: linux-test
     spec:
       containers:
         - name: runner
           image: gcr.io/llvm-premerge-checks/buildkite-linux:latest
           resources:
             limits:
-              cpu: 110
-              memory: 420Gi
+              cpu: 30
+              memory: 80Gi
             requests:
-              cpu: 110
-              memory: 420Gi
+              cpu: 30
+              memory: 80Gi
           volumeMounts:
             - name: github-ssh
               mountPath: /mnt/ssh
@@ -78,5 +78,5 @@ spec:
         - name: workdir
           emptyDir: {}
       nodeSelector:
-        cloud.google.com/gke-nodepool: linux-big
+        cloud.google.com/gke-nodepool: linux-agents-2
       terminationGracePeriodSeconds: 30
diff --git a/kubernetes/buildkite/linux-agents.yaml b/kubernetes/buildkite/linux.yaml
similarity index 100%
rename from kubernetes/buildkite/linux-agents.yaml
rename to kubernetes/buildkite/linux.yaml
diff --git a/kubernetes/buildkite/service-agents-test.yaml b/kubernetes/buildkite/service-test.yaml
similarity index 92%
rename from kubernetes/buildkite/service-agents-test.yaml
rename to kubernetes/buildkite/service-test.yaml
index dd0284c..065a32f 100644
--- a/kubernetes/buildkite/service-agents-test.yaml
+++ b/kubernetes/buildkite/service-test.yaml
@@ -15,7 +15,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: buildkite-service-agents-test
+  name: service-test
   namespace: buildkite
 spec:
   replicas: 1
@@ -26,11 +26,11 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: buildkite-service-agents
+      app: service-test
   template:
     metadata:
       labels:
-        app: buildkite-service-agents
+        app: service-test
     spec:
       containers:
         - name: runner
@@ -56,7 +56,7 @@ spec:
                 fieldRef:
                  fieldPath: metadata.name
             - name: BUILDKITE_AGENT_TAGS
-              value: "queue=service-test,name=$(POD_NAME)"
+              value: "queue=service-test,name=$(POD_NAME),cluster=google"
             - name: BUILDKITE_BUILD_PATH
               value: "/var/lib/buildkite-agent/builds"
             - name: CONDUIT_TOKEN
diff --git a/kubernetes/buildkite/service-agents.yaml b/kubernetes/buildkite/service.yaml
similarity index 88%
rename from kubernetes/buildkite/service-agents.yaml
rename to kubernetes/buildkite/service.yaml
index 44caf4d..6b0571d 100644
--- a/kubernetes/buildkite/service-agents.yaml
+++ b/kubernetes/buildkite/service.yaml
@@ -15,26 +15,26 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: service-agents
+  name: service
   namespace: buildkite
 spec:
   replicas: 4
   strategy:
     rollingUpdate:
-      maxSurge: 50%
-      maxUnavailable: 50%
+      maxUnavailable: 1
+      maxSurge: 0
     type: RollingUpdate
   selector:
     matchLabels:
-      app: agent-premerge-debian
+      app: service
   template:
     metadata:
       labels:
-        app: agent-premerge-debian
+        app: service
     spec:
       containers:
         - name: buildkite-premerge-debian
-          image: gcr.io/llvm-premerge-checks/buildkite-premerge-debian:stable
+          image: gcr.io/llvm-premerge-checks/buildkite-linux:latest
           resources:
             limits:
               cpu: 2
@@ -56,7 +56,7 @@ spec:
                 fieldRef:
                  fieldPath: metadata.name
             - name: BUILDKITE_AGENT_TAGS
-              value: "queue=service,name=$(POD_NAME)"
+              value: "queue=service,name=$(POD_NAME),cluster=google"
             - name: CONDUIT_TOKEN
               valueFrom:
                 secretKeyRef:
diff --git a/kubernetes/buildkite/windows-agents.yaml b/kubernetes/buildkite/windows-agents.yaml
index c1302cd..913f4b9 100644
--- a/kubernetes/buildkite/windows-agents.yaml
+++ b/kubernetes/buildkite/windows-agents.yaml
@@ -58,6 +58,8 @@ spec:
                 secretKeyRef:
                   name: buildkite-api-token-readonly
                   key: token
+            # - name: BUILDKITE_BUILD_CHECKOUT_PATH
+            #   value: "c:\\ws\\src"
       volumes:
         - name: workdir
           emptyDir: {}