diff --git a/kubernetes/buildkite/windows-112.yaml b/kubernetes/buildkite/windows-112.yaml
deleted file mode 100644
index 3207232..0000000
--- a/kubernetes/buildkite/windows-112.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://llvm.org/LICENSE.txt
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: windows-test-112
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: windows-test-112
-  template:
-    metadata:
-      labels:
-        app: windows-test-112
-    spec:
-      containers:
-        - name: buildkite-windows
-          image: gcr.io/llvm-premerge-checks/buildkite-windows:latest
-          resources:
-            limits:
-              cpu: 110
-              memory: 420Gi
-            requests:
-              cpu: 110
-              memory: 420Gi
-          volumeMounts:
-            - name: workdir
-              mountPath: "C:\\ws"
-          env:
-            - name: buildkiteAgentToken
-              valueFrom:
-                secretKeyRef:
-                  name: buildkite-agent-token
-                  key: token
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                 fieldPath: metadata.name
-            - name: BUILDKITE_AGENT_TAGS
-              value: "queue=windows-test-112,cluster=google"
-            - name: BUILDKITE_API_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: buildkite-api-token-readonly
-                  key: token
-            - name: BUILDKITE_BUILD_PATH
-              value: "c:/ws" # matching workdir
-      # Empty dir volume can use all disk space from VM. By default container
-      # disk will only be 20Gb and run out of space.
-      volumes:
-        - name: workdir
-          emptyDir: {}
-      nodeSelector:
-        cloud.google.com/gke-nodepool: windows
-      tolerations:
-      - key: "node.kubernetes.io/os"
-        operator: "Equal"
-        value: "windows"
-        effect: "NoSchedule"
-      terminationGracePeriodSeconds: 30
diff --git a/kubernetes/buildkite/windows-56.yaml b/kubernetes/buildkite/windows-56.yaml
deleted file mode 100644
index 08eefce..0000000
--- a/kubernetes/buildkite/windows-56.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the the Apache License v2.0 with LLVM Exceptions (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://llvm.org/LICENSE.txt
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: windows-test-56
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: windows-test-56
-  template:
-    metadata:
-      labels:
-        app: windows-test-56
-    spec:
-      containers:
-        - name: buildkite-windows
-          image: gcr.io/llvm-premerge-checks/buildkite-windows:latest
-          resources:
-            limits:
-              cpu: 55
-              memory: 200Gi
-            requests:
-              cpu: 55
-              memory: 200Gi
-          volumeMounts:
-            - name: workdir
-              mountPath: "C:\\ws"
-          env:
-            - name: buildkiteAgentToken
-              valueFrom:
-                secretKeyRef:
-                  name: buildkite-agent-token
-                  key: token
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                 fieldPath: metadata.name
-            - name: BUILDKITE_AGENT_TAGS
-              value: "queue=windows-test-56,cluster=google"
-            - name: BUILDKITE_API_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: buildkite-api-token-readonly
-                  key: token
-            - name: BUILDKITE_BUILD_PATH
-              value: "c:/ws" # matching workdir
-      # Empty dir volume can use all disk space from VM. By default container
-      # disk will only be 20Gb and run out of space.
-      volumes:
-        - name: workdir
-          emptyDir: {}
-      nodeSelector:
-        cloud.google.com/gke-nodepool: windows-56
-      tolerations:
-      - key: "node.kubernetes.io/os"
-        operator: "Equal"
-        value: "windows"
-        effect: "NoSchedule"
-      terminationGracePeriodSeconds: 30
diff --git a/kubernetes/buildkite/windows-32.yaml b/kubernetes/buildkite/windows-test-32.yaml
similarity index 100%
rename from kubernetes/buildkite/windows-32.yaml
rename to kubernetes/buildkite/windows-test-32.yaml
diff --git a/kubernetes/buildkite/windows.yaml b/kubernetes/buildkite/windows.yaml
index d3fd86c..7eca1db 100644
--- a/kubernetes/buildkite/windows.yaml
+++ b/kubernetes/buildkite/windows.yaml
@@ -17,7 +17,7 @@ kind: Deployment
 metadata:
   name: windows-buildkite
 spec:
-  replicas: 2
+  replicas: 8
   strategy:
     type: Recreate
   selector:
@@ -52,7 +52,7 @@ spec:
                 fieldRef:
                  fieldPath: metadata.name
             - name: BUILDKITE_AGENT_TAGS
-              value: "queue=windows-test,cluster=google"
+              value: "queue=windows,cluster=google"
             - name: BUILDKITE_API_TOKEN
               valueFrom:
                 secretKeyRef: