diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 3fa4932..fa2aa99 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -56,11 +56,13 @@ spec:
       #             values:
       #               - platform    # Modify this value based on your platform node labels.
       priorityClassName: system-cluster-critical
-      nodeSelector:
-        "node-role.kubernetes.io/control-plane": ""
+      # TODO: In the future, this could be replaced with tolerate only readiness.k8s.io/* taints specifically, when wildcard support is available in K8s.
+      # (ref: https://github.com/kubernetes/enhancements/issues/5500)
       tolerations:
-      - key: "node-role.kubernetes.io/control-plane"
-        operator: "Exists"
+      - operator: Exists
+        effect: NoSchedule
+      - operator: Exists
+        effect: NoExecute
       securityContext:
         # Projects are configured by default to adhere to the "restricted" Pod Security Standards.
         # This ensures that deployments meet the highest security requirements for Kubernetes.