diff --git a/capabilities/config/tanzu-capabilities-manager.yaml b/capabilities/config/tanzu-capabilities-manager.yaml
index c433e99a98..4ad5bd1c8c 100644
--- a/capabilities/config/tanzu-capabilities-manager.yaml
+++ b/capabilities/config/tanzu-capabilities-manager.yaml
@@ -31,3 +31,5 @@ spec:
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
diff --git a/capabilities/hack/ytt/schema.yaml b/capabilities/hack/ytt/schema.yaml
index 4285f1e08f..f4f92ba441 100644
--- a/capabilities/hack/ytt/schema.yaml
+++ b/capabilities/hack/ytt/schema.yaml
@@ -13,6 +13,12 @@ deployment:
       operator: ""
       #@schema/nullable
       tolerationSeconds: 0
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/control-plane
+      value: ""
+      operator: ""
+      #@schema/nullable
+      tolerationSeconds: 0
 rbac:
   #! PSP resource names capabilities controller should use in its ClusterRole rules.
   podSecurityPolicyNames:
diff --git a/packages/capabilities/bundle/config/upstream/tanzu-capabilities-controller-manager.yaml b/packages/capabilities/bundle/config/upstream/tanzu-capabilities-controller-manager.yaml
index d005f2ea20..fe72d23967 100644
--- a/packages/capabilities/bundle/config/upstream/tanzu-capabilities-controller-manager.yaml
+++ b/packages/capabilities/bundle/config/upstream/tanzu-capabilities-controller-manager.yaml
@@ -43,6 +43,8 @@ spec:
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
       #@ end
       #@ if hasattr(data.values, 'deployment') and hasattr(data.values.deployment, 'nodeSelector') and data.values.deployment.nodeSelector:
       #@overlay/match missing_ok=True