diff --git a/config/v1.0/aws-k8s-cni.yaml b/config/v1.0/aws-k8s-cni.yaml
index 4ac2d81ccf..651d7d004c 100644
--- a/config/v1.0/aws-k8s-cni.yaml
+++ b/config/v1.0/aws-k8s-cni.yaml
@@ -58,10 +58,7 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       containers:
       - image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:1.0.0
         name: aws-node
diff --git a/config/v1.0/calico.yaml b/config/v1.0/calico.yaml
index f74eab2da2..bf380d7968 100644
--- a/config/v1.0/calico.yaml
+++ b/config/v1.0/calico.yaml
@@ -114,13 +114,7 @@ spec:
             path: /var/run/calico
       tolerations:
         # Make sure calico/node gets scheduled on all nodes.
-        - effect: NoSchedule
-          operator: Exists
-        - effect: NoExecute
-          operator: Exists
-        # Mark the pod as a critical add-on for rescheduling.
-        - key: CriticalAddonsOnly
-          operator: Exists
+      - operator: Exists
 
 ---
 
@@ -375,8 +369,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
+      - operator: Exists
       hostNetwork: true
       serviceAccountName: calico-node
       containers: