diff --git a/packages/addons-manager/bundle/config/values.yaml b/packages/addons-manager/bundle/config/values.yaml
index 167b1b84eb..112bb12005 100644
--- a/packages/addons-manager/bundle/config/values.yaml
+++ b/packages/addons-manager/bundle/config/values.yaml
@@ -11,7 +11,13 @@ tanzuAddonsManager:
     hostNetwork: true
     priorityClassName: null
     nodeSelector: null
-    tolerations: []
+    tolerations:
+    - key: CriticalAddonsOnly
+      operator: Exists
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/master
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/control-plane
     webhookServerPort: 9865
     healthzPort: 18316
     clusterDeleteTimeout: "10m"
diff --git a/packages/framework/bundle/config/values.yaml b/packages/framework/bundle/config/values.yaml
index 0b52112822..2cd4586130 100644
--- a/packages/framework/bundle/config/values.yaml
+++ b/packages/framework/bundle/config/values.yaml
@@ -31,7 +31,13 @@ addonsManagerPackageValues:
       hostNetwork: true
       priorityClassName: system-cluster-critical
       nodeSelector: null
-      tolerations: []
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
       webhookServerPort: 9865
       healthzPort: 18316
       clusterDeleteTimeout: "10m"
diff --git a/packages/tkg/bundle/config/values.yaml b/packages/tkg/bundle/config/values.yaml
index c160fb2048..a536372203 100644
--- a/packages/tkg/bundle/config/values.yaml
+++ b/packages/tkg/bundle/config/values.yaml
@@ -42,7 +42,13 @@ frameworkPackage:
         hostNetwork: true
         priorityClassName: system-cluster-critical
         nodeSelector: null
-        tolerations: []
+        tolerations:
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
         webhookServerPort: 9865
         healthzPort: 18316
         clusterDeleteTimeout: "10m"