diff --git a/helm/values.yaml b/helm/values.yaml
index 4a37f85..59a59a8 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -83,8 +83,20 @@ resources:
 # This toleration is to have the daemonset runnable on master nodes
 # You want to run one pod on all nodes by default
 tolerations:
-  - key: node-role.kubernetes.io/master
-    effect: NoSchedule
+- effect: NoSchedule
+  operator: Exists
+- effect: NoExecute
+  operator: Exists
 
 nodeSelector: {}
-affinity: {}
+
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: "node-role.kubernetes.io/master"
+          operator: Exists
+      - matchExpressions:
+        - key: "node-role.kubernetes.io/control-plane"
+          operator: Exists