diff --git a/images/buildstack.yml b/images/buildstack.yml
index f179320..87729ad 100644
--- a/images/buildstack.yml
+++ b/images/buildstack.yml
@@ -1,38 +1,6 @@
 version: "3.9"
 
 services:
-  runner-proxy:
-    image: uazo/privoxy
-    networks:
-      - bridge-ext
-    env_file:
-      - buildstack.env
-    volumes:
-      - /tmp/proxy:/tmp/proxy:rw
-      - /tmp/forward-proxy:/tmp/forward-proxy:rw
-    deploy:
-      mode: global
-      placement:
-        max_replicas_per_node: 1
-        constraints: [node.labels.githubrunner == 1]
-
-#  githubrunner:
-#    image: uazo/github-runner
-#    runtime: sysbox-runc
-#    depends_on:
-#      - runner-proxy
-#    networks:
-#      - bridge-int
-#    volumes:
-#      - /tmp/proxy:/tmp/proxy:rw
-#      - /tmp/forward-proxy:/tmp/forward-proxy:rw
-#      - /tmp/docker-inner:/var/lib/docker:rw
-#    deploy:
-#      mode: global
-#      placement:
-#        max_replicas_per_node: 1
-#        constraints: [node.labels.githubrunner == 1]
-
   buildboxcasd:
     image: uazo/buildboxcasd
     networks:
@@ -40,12 +8,40 @@ services:
     env_file:
       - buildstack.env
     volumes:
-      - /tmp/cache:/wrk-cache:rw
+      - /cache:/wrk-cache:rw
     deploy:
       mode: global
       placement:
         max_replicas_per_node: 1
 
+  buildboxrunner-32:
+    image: uazo/buildboxrunner
+    networks:
+      - bridge-int
+    depends_on:
+      - buildboxcasd
+    volumes:
+      - /cache:/wrk-cache:rw
+    deploy:
+      replicas: 40
+      placement:
+        max_replicas_per_node: 30
+        constraints: [node.labels.gomarunners == 32]
+
+  buildboxrunner-12:
+    image: uazo/buildboxrunner
+    networks:
+      - bridge-int
+    depends_on:
+      - buildboxcasd
+    volumes:
+      - /cache:/wrk-cache:rw
+    deploy:
+      replicas: 60
+      placement:
+        max_replicas_per_node: 12
+        constraints: [node.labels.gomarunners == 12]
+
   buildboxrunner-8:
     image: uazo/buildboxrunner
     networks:
@@ -53,9 +49,9 @@ services:
     depends_on:
       - buildboxcasd
     volumes:
-      - /tmp/cache:/wrk-cache:rw
+      - /cache:/wrk-cache:rw
     deploy:
-      replicas: 20
+      replicas: 60
       placement:
         max_replicas_per_node: 8
         constraints: [node.labels.gomarunners == 8]
@@ -67,9 +63,9 @@ services:
     depends_on:
       - buildboxcasd
     volumes:
-      - /tmp/cache:/wrk-cache:rw
+      - /cache:/wrk-cache:rw
     deploy:
-      replicas: 20
+      replicas: 60
       placement:
         max_replicas_per_node: 6
         constraints: [node.labels.gomarunners == 6]
@@ -81,13 +77,27 @@ services:
     depends_on:
       - buildboxcasd
     volumes:
-      - /tmp/cache:/wrk-cache:rw
+      - /cache:/wrk-cache:rw
     deploy:
-      replicas: 20
+      replicas: 60
       placement:
         max_replicas_per_node: 4
         constraints: [node.labels.gomarunners == 4]
 
+  buildboxrunner-2:
+    image: uazo/buildboxrunner
+    networks:
+      - bridge-int
+    depends_on:
+      - buildboxcasd
+    volumes:
+      - /cache:/wrk-cache:rw
+    deploy:
+      replicas: 60
+      placement:
+        max_replicas_per_node: 2
+        constraints: [node.labels.gomarunners == 2]
+
 networks:
   bridge-int:
     driver: overlay