diff --git a/goldilocks/helm-values.yaml b/goldilocks/helm-values.yaml
index 995e9d9..e937e7f 100644
--- a/goldilocks/helm-values.yaml
+++ b/goldilocks/helm-values.yaml
@@ -60,14 +60,14 @@ controller:
   # Set to false to only monitor namespaces with the label: goldilocks.fairwinds.com/enabled=true
   enableCostRecommendations: true
 
-  # Schedule on master node
+  # Schedule on control-plane node
   nodeSelector:
-    node-role.kubernetes.io/master: "true"
+    node-role.kubernetes.io/control-plane: "true"
 
   tolerations:
-    - key: node-role.kubernetes.io/master
+    - key: node-role.kubernetes.io/control-plane
       operator: Exists
-      effect: NoExecute
+      effect: NoSchedule
 
 # VPA configuration (should already be installed)
 vpa:
diff --git a/kube-state-metrics/helm-values.yaml b/kube-state-metrics/helm-values.yaml
index e24601b..8125951 100644
--- a/kube-state-metrics/helm-values.yaml
+++ b/kube-state-metrics/helm-values.yaml
@@ -14,14 +14,14 @@ resources:
   limits:
     memory: 150Mi
 
-# Schedule on master node
+# Schedule on control-plane node
 nodeSelector:
-  node-role.kubernetes.io/master: "true"
+  node-role.kubernetes.io/control-plane: "true"
 
 tolerations:
-  - key: node-role.kubernetes.io/master
+  - key: node-role.kubernetes.io/control-plane
     operator: Exists
-    effect: NoExecute
+    effect: NoSchedule
 
 service:
   type: ClusterIP
diff --git a/promtail/helm-values.yaml b/promtail/helm-values.yaml
index b4a3667..6e17dc9 100644
--- a/promtail/helm-values.yaml
+++ b/promtail/helm-values.yaml
@@ -37,11 +37,8 @@ resources:
   limits:
     memory: 182Mi
 
-# Tolerations to run on all nodes including master
+# Tolerations to run on all nodes including control-plane
 tolerations:
-  - key: node-role.kubernetes.io/master
-    operator: Exists
-    effect: NoSchedule
   - key: node-role.kubernetes.io/control-plane
     operator: Exists
     effect: NoSchedule
diff --git a/vpa/helm-values.yaml b/vpa/helm-values.yaml
index c83498b..27c64f3 100644
--- a/vpa/helm-values.yaml
+++ b/vpa/helm-values.yaml
@@ -13,14 +13,14 @@ recommender:
     limits:
       memory: 192Mi
 
-  # Schedule on master node
+  # Schedule on control-plane node
   nodeSelector:
-    node-role.kubernetes.io/master: "true"
+    node-role.kubernetes.io/control-plane: "true"
 
   tolerations:
-    - key: node-role.kubernetes.io/master
+    - key: node-role.kubernetes.io/control-plane
       operator: Exists
-      effect: NoExecute
+      effect: NoSchedule
 
 # Updater - applies recommended resource requests to pods
 # Disabled because we're using updateMode: Off (recommendations only)