diff --git a/apps/forgejo/runner-deployment.yaml b/apps/forgejo/runner-deployment.yaml
index 473b141..f80c559 100644
--- a/apps/forgejo/runner-deployment.yaml
+++ b/apps/forgejo/runner-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: forgejo-runner
 spec:
-  replicas: 1
+  replicas: 2
   selector:
     matchLabels:
       app: forgejo-runner
@@ -15,9 +15,21 @@ spec:
       labels:
         app: forgejo-runner
     spec:
-      # Schedule on nxtgauge-2 where docker is available
-      nodeSelector:
-        kubernetes.io/hostname: nxtgauge-2
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: DoesNotExist
+                  - key: node-role.kubernetes.io/master
+                    operator: DoesNotExist
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  app: forgejo-runner
+              topologyKey: kubernetes.io/hostname
       containers:
       - name: runner
         image: code.forgejo.org/forgejo/runner:6
@@ -32,7 +44,9 @@ spec:
               name: forgejo-runner-secret
               key: token
         - name: FORGEJO_RUNNER_NAME
-          value: nxtgauge-runner-1
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: FORGEJO_RUNNER_LABELS
           value: "ubuntu-latest:docker://node:20-bookworm,self-hosted:docker://node:20-bookworm,ubuntu-22.04:docker://node:20-bookworm,ubuntu-24.04:docker://node:20-bookworm,debian-12:docker://node:20-bookworm"
         volumeMounts: