diff --git a/charts/argo-workflow/templates/deployment.yaml b/charts/argo-workflow/templates/deployment.yaml
index fdf05bd7..f5eede15 100644
--- a/charts/argo-workflow/templates/deployment.yaml
+++ b/charts/argo-workflow/templates/deployment.yaml
@@ -23,6 +23,18 @@ spec:
 {{- toYaml $.Values.argoWorkflow.labels | nindent 8 }}      
         {{- end }}
     spec:
+     {{- if $.Values.argoWorkflow.nodeselector }}
+      nodeSelector:
+      {{- toYaml .Values.argoWorkflow.nodeselector | nindent 8}}
+      {{- end }}
+      {{- if $.Values.argoWorkflow.tolerations }}
+      tolerations:
+      {{- range $tol := .Values.argoWorkflow.tolerations }}
+        - key: {{ $tol.key }}
+          operator: {{ $tol.operator }}
+          effect: {{ $tol.effect }}
+      {{- end }}    
+      {{- end }}
       containers:
       - args:
         - --configmap
diff --git a/charts/argo-workflow/values.yaml b/charts/argo-workflow/values.yaml
index 0473fb0c..63e0d905 100644
--- a/charts/argo-workflow/values.yaml
+++ b/charts/argo-workflow/values.yaml
@@ -5,6 +5,8 @@ argoWorkflow:
     region: us-east-2
   replicas: 1
   labels: {}
+  nodeselector: {}
+  tolerations: []
   annotations: {}
   EnvVariables: []
   EnvVariablesFrom: []