diff --git a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
index 0ac1c6a..101a870 100644
--- a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
+++ b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
@@ -299,6 +299,9 @@ pod:
       - key: node-role.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
+      - key: node-role.kubernetes.io/control-plane
+        operator: Exists
+        effect: NoSchedule
   mounts:
     fm_rest_api:
       init_container: null
diff --git a/node-feature-discovery/node-feature-discovery/helm-charts/node-feature-discovery/values.yaml b/node-feature-discovery/node-feature-discovery/helm-charts/node-feature-discovery/values.yaml
index 5546128..1adc697 100644
--- a/node-feature-discovery/node-feature-discovery/helm-charts/node-feature-discovery/values.yaml
+++ b/node-feature-discovery/node-feature-discovery/helm-charts/node-feature-discovery/values.yaml
@@ -56,6 +56,10 @@ master:
     operator: "Equal"
     value: ""
     effect: "NoSchedule"
+  - key: "node-role.kubernetes.io/control-plane"
+    operator: "Equal"
+    value: ""
+    effect: "NoSchedule"
 
   annotations: {}
 
@@ -68,6 +72,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/secret-observer/secret-observer/helm-charts/secret-observer/values.yaml b/secret-observer/secret-observer/helm-charts/secret-observer/values.yaml
index e794358..02ec434 100644
--- a/secret-observer/secret-observer/helm-charts/secret-observer/values.yaml
+++ b/secret-observer/secret-observer/helm-charts/secret-observer/values.yaml
@@ -20,7 +20,7 @@ serviceAccount:
 cronSchedule: "0 1 * * *"
 
 nodeSelector:
-  node-role.kubernetes.io/master: ""
+  node-role.kubernetes.io/control-plane: ""
 
 jobs:
   startingDeadlineSeconds: 200