diff --git a/goldilocks/helm-values.yaml b/goldilocks/helm-values.yaml
index afe7dd2..d18bbd4 100644
--- a/goldilocks/helm-values.yaml
+++ b/goldilocks/helm-values.yaml
@@ -60,15 +60,6 @@ controller:
   # Set to false to only monitor namespaces with the label: goldilocks.fairwinds.com/enabled=true
   enableCostRecommendations: true
 
-  # Schedule on control-plane node
-  nodeSelector:
-    node-role.kubernetes.io/control-plane: "true"
-
-  tolerations:
-    - key: node-role.kubernetes.io/control-plane
-      operator: Exists
-      effect: NoSchedule
-
 # VPA configuration (should already be installed)
 vpa:
   # Set to false since we're installing VPA separately
diff --git a/kube-state-metrics/helm-values.yaml b/kube-state-metrics/helm-values.yaml
index bc28304..c1adb8c 100644
--- a/kube-state-metrics/helm-values.yaml
+++ b/kube-state-metrics/helm-values.yaml
@@ -14,15 +14,6 @@ resources:
   limits:
     memory: 105Mi
 
-# Schedule on control-plane node
-nodeSelector:
-  node-role.kubernetes.io/control-plane: "true"
-
-tolerations:
-  - key: node-role.kubernetes.io/control-plane
-    operator: Exists
-    effect: NoSchedule
-
 service:
   type: ClusterIP
   clusterIP: None
diff --git a/opentelemetry-collector/helm-values.yaml b/opentelemetry-collector/helm-values.yaml
index 7dea45d..9303d9d 100644
--- a/opentelemetry-collector/helm-values.yaml
+++ b/opentelemetry-collector/helm-values.yaml
@@ -32,14 +32,6 @@ resources:
   limits:
     memory: 512Mi
 
-# =============================================================================
-# Tolerations (run on all nodes including master)
-# =============================================================================
-tolerations:
-  - key: node-role.kubernetes.io/control-plane
-    operator: Exists
-    effect: NoSchedule
-
 # =============================================================================
 # Extra Volumes for Log Collection
 # =============================================================================
diff --git a/opentelemetry-collector/manifests/collector.yaml b/opentelemetry-collector/manifests/collector.yaml
index 4bccf98..b07201d 100644
--- a/opentelemetry-collector/manifests/collector.yaml
+++ b/opentelemetry-collector/manifests/collector.yaml
@@ -27,11 +27,6 @@ spec:
     limits:
       memory: 512Mi
 
-  tolerations:
-    - key: node-role.kubernetes.io/control-plane
-      operator: Exists
-      effect: NoSchedule
-
   volumeMounts:
     - name: varlogpods
       mountPath: /var/log/pods
diff --git a/opentelemetry-operator/helm-values.yaml b/opentelemetry-operator/helm-values.yaml
index d265391..510fbff 100644
--- a/opentelemetry-operator/helm-values.yaml
+++ b/opentelemetry-operator/helm-values.yaml
@@ -49,11 +49,3 @@ kubeRBACProxy:
       cpu: 5m
       memory: 64Mi
 
-# Schedule on master node
-tolerations:
-  - key: node-role.kubernetes.io/control-plane
-    operator: Exists
-    effect: NoSchedule
-
-nodeSelector:
-  node-role.kubernetes.io/control-plane: "true"
diff --git a/promtail/helm-values.yaml b/promtail/helm-values.yaml
index 6e17dc9..4bd10fd 100644
--- a/promtail/helm-values.yaml
+++ b/promtail/helm-values.yaml
@@ -37,12 +37,6 @@ resources:
   limits:
     memory: 182Mi
 
-# Tolerations to run on all nodes including control-plane
-tolerations:
-  - key: node-role.kubernetes.io/control-plane
-    operator: Exists
-    effect: NoSchedule
-
 # ServiceMonitor disabled
 serviceMonitor:
   enabled: false
diff --git a/vpa/helm-values.yaml b/vpa/helm-values.yaml
index 231a8a4..8901c36 100644
--- a/vpa/helm-values.yaml
+++ b/vpa/helm-values.yaml
@@ -13,15 +13,6 @@ recommender:
     limits:
       memory: 100Mi
 
-  # Schedule on control-plane node
-  nodeSelector:
-    node-role.kubernetes.io/control-plane: "true"
-
-  tolerations:
-    - key: node-role.kubernetes.io/control-plane
-      operator: Exists
-      effect: NoSchedule
-
 # Updater - applies recommended resource requests to pods
 # Disabled because we're using updateMode: Off (recommendations only)
 updater: