diff --git a/forgejo/resources/runners/act-runner-amd64.yaml b/forgejo/resources/runners/act-runner-amd64.yaml
index ec602e3..7608ab6 100644
--- a/forgejo/resources/runners/act-runner-amd64.yaml
+++ b/forgejo/resources/runners/act-runner-amd64.yaml
@@ -9,6 +9,8 @@ spec:
       app.kubernetes.io/name: act-runner
       app.kubernetes.io/instance: amd64
   replicas: 1
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
@@ -37,7 +39,7 @@ spec:
             - name: RUNNER_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.name
+                  fieldPath: spec.nodeName
             - name: RUNNER_SECRET
               valueFrom:
                 secretKeyRef:
@@ -103,6 +105,16 @@ spec:
         fsGroup: 1000
       nodeSelector:
         kubernetes.io/arch: amd64
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: kubernetes.io/hostname
+              labelSelector:
+                matchExpressions:
+                  - key: app.kubernetes.io/name
+                    operator: In
+                    values:
+                      - act-runner
       volumes:
         - name: runner-data
           emptyDir:
diff --git a/forgejo/resources/runners/act-runner-arm64.yaml b/forgejo/resources/runners/act-runner-arm64.yaml
index 8d94510..daadc67 100644
--- a/forgejo/resources/runners/act-runner-arm64.yaml
+++ b/forgejo/resources/runners/act-runner-arm64.yaml
@@ -40,7 +40,7 @@ spec:
             - name: RUNNER_NAME
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.name
+                  fieldPath: spec.nodeName
             - name: RUNNER_SECRET
               valueFrom:
                 secretKeyRef: