diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml
index ff72431232..2c95c29616 100644
--- a/stable/concourse/Chart.yaml
+++ b/stable/concourse/Chart.yaml
@@ -1,6 +1,6 @@
 name: concourse
-version: 0.8.2
-appVersion: 3.5.0
+version: 0.9.0
+appVersion: 3.6.0
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
 keywords:
diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml
index 0ac9f75d5b..92e2e336dd 100644
--- a/stable/concourse/templates/web-deployment.yaml
+++ b/stable/concourse/templates/web-deployment.yaml
@@ -14,6 +14,8 @@ spec:
       labels:
         app: {{ template "concourse.web.fullname" . }}
     spec:
+      tolerations:
+{{ toYaml .Values.web.tolerations | indent 8 }}
       containers:
         - name: {{ template "concourse.web.fullname" . }}
           image: "{{ .Values.image }}:{{ .Values.imageTag }}"
diff --git a/stable/concourse/templates/worker-statefulset.yaml b/stable/concourse/templates/worker-statefulset.yaml
index 7854e9961d..c8ef59cb55 100644
--- a/stable/concourse/templates/worker-statefulset.yaml
+++ b/stable/concourse/templates/worker-statefulset.yaml
@@ -20,6 +20,8 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
     spec:
+      tolerations:
+{{ toYaml .Values.worker.tolerations | indent 8 }}
       terminationGracePeriodSeconds: {{ .Values.worker.terminationGracePeriodSeconds }}
       containers:
         - name: {{ template "concourse.worker.fullname" . }}
diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml
index c1b9d25364..c8316e5081 100644
--- a/stable/concourse/values.yaml
+++ b/stable/concourse/values.yaml
@@ -302,6 +302,15 @@ web:
   #               values:
   #                 - "true"
 
+  ## Tolerations for the worker nodes.
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # tolerations:
+  #  - key: "toleration=key"
+  #    operator: "Equal"
+  #    value: "value"
+  #    effect: "NoSchedule"
+
   ## Configure resource requests and limits.
   ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -413,6 +422,15 @@ worker:
   #               values:
   #                 - "true"
 
+  ## Tolerations for the worker nodes.
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
+  # tolerations:
+  #  - key: "toleration=key"
+  #    operator: "Equal"
+  #    value: "value"
+  #    effect: "NoSchedule"
+
   ## Time to delay after the worker process shuts down. This inserts time between shutdown and startup
   ## to avoid errors caused by a worker restart.
   postStopDelaySeconds: 60