diff --git a/stable/dask/Chart.yaml b/stable/dask/Chart.yaml
index 9f3a2695f3..1ccba874af 100755
--- a/stable/dask/Chart.yaml
+++ b/stable/dask/Chart.yaml
@@ -1,5 +1,5 @@
 name: dask
-version: 2.1.0
+version: 2.2.0
 appVersion: 1.1.0
 description: Distributed computation in Python with task scheduling
 home: https://dask.pydata.org
diff --git a/stable/dask/README.md b/stable/dask/README.md
index 0567fafab5..d606d066c4 100644
--- a/stable/dask/README.md
+++ b/stable/dask/README.md
@@ -35,7 +35,9 @@ The following tables list the configurable parameters of the Dask chart and thei
 | `scheduler.image`          | Container image name     | `daskdev/dask`   |
 | `scheduler.imageTag`       | Container image tag      | `1.1.0`         |
 | `scheduler.replicas`       | k8s deployment replicas  | `1`              |
-| `scheduler.resources`      | Container resources      | `{}`             |
+| `scheduler.tolerations`    | Tolerations              | `[]`             |
+| `scheduler.nodeSelector`   | nodeSelector             | `{}`             |
+| `scheduler.affinity`       | Container affinity       | `{}`             |
 
 ### Dask webUI
 
@@ -50,9 +52,12 @@ The following tables list the configurable parameters of the Dask chart and thei
 | -----------------------      | ---------------------------------| ---------------|
 | `worker.name`                | Dask worker name                 | `worker`       |
 | `worker.image`               | Container image name             | `daskdev/dask` |
-| `worker.imageTag`            | Container image tag              | `1.1.0`       |
+| `worker.imageTag`            | Container image tag              | `1.1.0`        |
 | `worker.replicas`            | k8s hpa and deployment replicas  | `3`            |
 | `worker.resources`           | Container resources              | `{}`           |
+| `worker.tolerations`         | Tolerations                      | `[]`           |
+| `worker.nodeSelector`        | nodeSelector                     | `{}`           |
+| `worker.affinity`            | Container affinity               | `{}`           |
 |
 
 ### jupyter
@@ -62,10 +67,13 @@ The following tables list the configurable parameters of the Dask chart and thei
 | `jupyter.name`          | Jupyter name                     | `jupyter`                |
 | `jupyter.enabled`       | Include optional Jupyter server  | `true`                   |
 | `jupyter.image`         | Container image name             | `daskdev/dask-notebook`  |
-| `jupyter.imageTag`      | Container image tag              | `1.1.0`                 |
+| `jupyter.imageTag`      | Container image tag              | `1.1.0`                  |
 | `jupyter.replicas`      | k8s deployment replicas          | `1`                      |
 | `jupyter.servicePort`   | k8s service port                 | `80`                     |
 | `jupyter.resources`     | Container resources              | `{}`                     |
+| `jupyter.tolerations`   | Tolerations                      | `[]`                     |
+| `jupyter.nodeSelector`  | nodeSelector                     | `{}`                     |
+| `jupyter.affinity`      | Container affinity               | `{}`                     |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 
diff --git a/stable/dask/templates/dask-jupyter-deployment.yaml b/stable/dask/templates/dask-jupyter-deployment.yaml
index f704ec29ee..919282932d 100644
--- a/stable/dask/templates/dask-jupyter-deployment.yaml
+++ b/stable/dask/templates/dask-jupyter-deployment.yaml
@@ -47,5 +47,16 @@ spec:
         - name: config-volume
           configMap:
             name: {{ template "dask.fullname" . }}-jupyter-config
-
-{{ end }}
+    {{- with .Values.jupyter.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.jupyter.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.jupyter.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+{{- end }}
diff --git a/stable/dask/templates/dask-scheduler-deployment.yaml b/stable/dask/templates/dask-scheduler-deployment.yaml
index 7c65b8063a..791a6c1e78 100644
--- a/stable/dask/templates/dask-scheduler-deployment.yaml
+++ b/stable/dask/templates/dask-scheduler-deployment.yaml
@@ -41,3 +41,15 @@ spec:
 {{ toYaml .Values.scheduler.resources | indent 12 }}
           env:
 {{ toYaml .Values.scheduler.env | indent 12 }}
+    {{- with .Values.scheduler.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.scheduler.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.scheduler.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/stable/dask/templates/dask-worker-deployment.yaml b/stable/dask/templates/dask-worker-deployment.yaml
index cdef7b17ee..350aeef6a2 100644
--- a/stable/dask/templates/dask-worker-deployment.yaml
+++ b/stable/dask/templates/dask-worker-deployment.yaml
@@ -44,12 +44,15 @@ spec:
 {{ toYaml .Values.worker.resources | indent 12 }}
           env:
 {{ toYaml .Values.worker.env | indent 12 }}
+    {{- with .Values.worker.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.worker.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.worker.tolerations }}
       tolerations:
-        - key: "k8s.dask.org_dedicated"
-          operator: "Equal"
-          value: "worker"
-          effect: "NoSchedule"
-        - key: "k8s.dask.org/dedicated"
-          operator: "Equal"
-          value: "worker"
-          effect: "NoSchedule"
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/stable/dask/values.yaml b/stable/dask/values.yaml
index 7edce6d339..874e3718b6 100644
--- a/stable/dask/values.yaml
+++ b/stable/dask/values.yaml
@@ -17,6 +17,9 @@ scheduler:
     # requests:
     #   cpu: 1.8
     #   memory: 6G
+  tolerations: []
+  nodeSelector: {}
+  affinity: {}
 
 webUI:
   name: webui
@@ -45,6 +48,9 @@ worker:
     # requests:
     #   cpu: 1
     #   memory: 3G
+  tolerations: []
+  nodeSelector: {}
+  affinity: {}
 
 jupyter:
   name: jupyter
@@ -69,3 +75,6 @@ jupyter:
     # requests:
     #   cpu: 2
     #   memory: 6G
+  tolerations: []
+  nodeSelector: {}
+  affinity: {}