diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index c3fda72b..27b2d622 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.4.3"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.6.7
+version: 0.6.8
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/ui-deployment.yaml b/charts/argo/templates/ui-deployment.yaml
index 1cd416cf..a9c2167a 100644
--- a/charts/argo/templates/ui-deployment.yaml
+++ b/charts/argo/templates/ui-deployment.yaml
@@ -35,7 +35,7 @@ spec:
           - name: {{ .Values.ui.podPortName }}
             containerPort: 8001
             protocol: TCP
-          {{- end }}        
+          {{- end }}
           env:
           {{- if .Values.ui.forceNamespaceIsolation }}
           - name: FORCE_NAMESPACE_ISOLATION
@@ -52,4 +52,17 @@ spec:
             value: /
           resources:
             {{- toYaml .Values.ui.resources | nindent 12 }}
+      {{- with .Values.ui.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ui.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.ui.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+
 {{- end -}}
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index 855373d3..06b708c6 100644
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -52,3 +52,15 @@ spec:
           ports:
           - containerPort: 8080
           {{- end }}
+      {{- with .Values.controller.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controller.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.controller.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 8ef57d6f..c41025b7 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -88,6 +88,12 @@ controller:
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 1
+  ## Node selectors and tolerations for server scheduling to nodes with taints
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ##
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
 
 executor:
   image:
@@ -126,6 +132,12 @@ ui:
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 1
+  ## Node selectors and tolerations for server scheduling to nodes with taints
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  ##
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
 
   ## Ingress configuration.
   ## ref: https://kubernetes.io/docs/user-guide/ingress/