diff --git a/manifests/woodpecker/values.yaml b/manifests/woodpecker/values.yaml
index 094f2cd..4a83fc4 100644
--- a/manifests/woodpecker/values.yaml
+++ b/manifests/woodpecker/values.yaml
@@ -69,4 +69,16 @@ agent:
       emptyDir: {}
 
 nodeSelector:
-  node-role.kubernetes.io/worker: "true"
+  workload: general
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: workload
+              operator: In
+              values:
+                - general
+            - key: node-role.kubernetes.io/control-plane
+              operator: DoesNotExist