diff --git a/falco/helm-values.yaml b/falco/helm-values.yaml
index 5b52b6b..c1c2e72 100644
--- a/falco/helm-values.yaml
+++ b/falco/helm-values.yaml
@@ -177,15 +177,9 @@ serviceAccount:
 # Node selector to run on all nodes
 nodeSelector: {}
 
-# Tolerations to run on all nodes including masters
+# Tolerations to run on all nodes including control-plane
 tolerations:
   - effect: NoSchedule
-    key: node-role.kubernetes.io/master
-  - effect: NoExecute
-    key: node-role.kubernetes.io/master
-  - effect: NoSchedule
-    key: node-role.kubernetes.io/control-plane
-  - effect: NoExecute
     key: node-role.kubernetes.io/control-plane
 
 # Run as DaemonSet on all nodes
diff --git a/vault/helm-values.yaml b/vault/helm-values.yaml
index 36d44bc..e818234 100644
--- a/vault/helm-values.yaml
+++ b/vault/helm-values.yaml
@@ -72,11 +72,11 @@ server:
     type: ClusterIP
     port: 8200
 
-  # Tolerations for master node
+  # Tolerations for control-plane node
   tolerations:
-    - key: "node-role.kubernetes.io/master"
+    - key: "node-role.kubernetes.io/control-plane"
       operator: "Exists"
-      effect: "NoExecute"
+      effect: "NoSchedule"
 
 # UI 활성화
 ui: