diff --git a/deployment/node-feature-discovery/Chart.yaml b/deployment/node-feature-discovery/Chart.yaml
index df6b4be63..c3691c7d4 100644
--- a/deployment/node-feature-discovery/Chart.yaml
+++ b/deployment/node-feature-discovery/Chart.yaml
@@ -12,4 +12,4 @@ keywords:
   - feature-detection
   - node-labels
 type: application
-version: 0.1.2
+version: 0.2.0
diff --git a/deployment/node-feature-discovery/values.yaml b/deployment/node-feature-discovery/values.yaml
index 0e7553bdf..9c261f022 100644
--- a/deployment/node-feature-discovery/values.yaml
+++ b/deployment/node-feature-discovery/values.yaml
@@ -58,6 +58,10 @@ master:
     operator: "Equal"
     value: ""
     effect: "NoSchedule"
+  - key: "node-role.kubernetes.io/control-plane"
+    operator: "Equal"
+    value: ""
+    effect: "NoSchedule"
 
   annotations: {}
 
@@ -70,6 +74,12 @@ master:
               - key: "node-role.kubernetes.io/master"
                 operator: In
                 values: [""]
+        - weight: 1
+          preference:
+            matchExpressions:
+              - key: "node-role.kubernetes.io/control-plane"
+                operator: In
+                values: [""]
 
 worker:
   configmapName: nfd-worker-conf
diff --git a/nfd-master.yaml.template b/nfd-master.yaml.template
index f392f8f63..97ce794c0 100644
--- a/nfd-master.yaml.template
+++ b/nfd-master.yaml.template
@@ -70,11 +70,21 @@ spec:
                   - key: "node-role.kubernetes.io/master"
                     operator: In
                     values: [""]
+            - weight: 1
+              preference:
+                matchExpressions:
+                  - key: "node-role.kubernetes.io/control-plane"
+                    operator: In
+                    values: [""]
       tolerations:
         - key: "node-role.kubernetes.io/master"
           operator: "Equal"
           value: ""
           effect: "NoSchedule"
+        - key: "node-role.kubernetes.io/control-plane"
+          operator: "Equal"
+          value: ""
+          effect: "NoSchedule"
       containers:
         - env:
           - name: NODE_NAME
diff --git a/nfd-prune.yaml.template b/nfd-prune.yaml.template
index a154683ee..90876757c 100644
--- a/nfd-prune.yaml.template
+++ b/nfd-prune.yaml.template
@@ -67,11 +67,21 @@ spec:
                   - key: "node-role.kubernetes.io/master"
                     operator: In
                     values: [""]
+            - weight: 1
+              preference:
+                matchExpressions:
+                  - key: "node-role.kubernetes.io/control-plane"
+                    operator: In
+                    values: [""]
       tolerations:
         - key: "node-role.kubernetes.io/master"
           operator: "Equal"
           value: ""
           effect: "NoSchedule"
+        - key: "node-role.kubernetes.io/control-plane"
+          operator: "Equal"
+          value: ""
+          effect: "NoSchedule"
       containers:
         - name: nfd-master
           image: gcr.io/k8s-staging-nfd/node-feature-discovery:master