diff --git a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
index a2fb5d04ae..d00d41f7d5 100644
--- a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
+++ b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
@@ -78,4 +78,10 @@ spec:
       {{- with .Values.cluster_resource_manager.nodeSelector }}
       nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
+      {{- with .Values.cluster_resource_manager.affinity }}
+      affinity: {{ tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
+      {{- with .Values.cluster_resource_manager.tolerations }}
+      tolerations: {{ tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
   {{- end }}
diff --git a/charts/flyte-core/templates/propeller/webhook.yaml b/charts/flyte-core/templates/propeller/webhook.yaml
index 90241a69f8..1942ef416a 100644
--- a/charts/flyte-core/templates/propeller/webhook.yaml
+++ b/charts/flyte-core/templates/propeller/webhook.yaml
@@ -126,6 +126,12 @@ spec:
       {{- with .Values.flytepropeller.nodeSelector }}
       nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
+      {{- with .Values.flytepropeller.affinity }}
+      affinity: {{ tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
+      {{- with .Values.flytepropeller.tolerations }}
+      tolerations: {{ tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
 ---
 # Service
 apiVersion: v1
diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
index 4d1e77def0..ee0d4504fa 100755
--- a/charts/flyte-core/values.yaml
+++ b/charts/flyte-core/values.yaml
@@ -482,6 +482,13 @@ webhook:
       cpu: 200m
       ephemeral-storage: 500Mi
       memory: 500Mi
+  
+  # -- nodeSelector for Webhook deployment
+  nodeSelector: {}
+  # -- tolerations for Webhook deployment
+  tolerations: []
+  # -- affinity for Webhook deployment
+  affinity: {}
 
 # ------------------------------------------------
 #
@@ -913,6 +920,10 @@ cluster_resource_manager:
   podLabels: {}
   # -- nodeSelector for ClusterResource deployment
   nodeSelector: {}
+  # -- tolerations for ClusterResource deployment
+  tolerations: []
+  # -- affinity for ClusterResource deployment
+  affinity: {}
   # -- Resources for ClusterResource deployment
   resources: {}
   # -- Configmap for ClusterResource parameters