diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml
index 7cd77b2500..b47317c008 100644
--- a/stable/concourse/Chart.yaml
+++ b/stable/concourse/Chart.yaml
@@ -1,5 +1,5 @@
 name: concourse
-version: 0.3.1
+version: 0.3.2
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
 keywords:
@@ -11,6 +11,8 @@ sources:
   - https://github.com/concourse/bin
   - https://github.com/kubernetes/charts
 maintainers:
-  - name: Ferran Rodenas
+  - name: frodenas
     email: frodenas@gmail.com
+  - name: viglesiasce
+    email: viglesias@google.com
 engine: gotpl
diff --git a/stable/concourse/templates/secrets.yaml b/stable/concourse/templates/secrets.yaml
index 58de1fa328..a5fc8898dd 100644
--- a/stable/concourse/templates/secrets.yaml
+++ b/stable/concourse/templates/secrets.yaml
@@ -27,3 +27,5 @@ data:
   gitlab-auth-client-secret: {{ default "" .Values.concourse.gitlabAuthClientSecret | b64enc | quote }}
   generic-oauth-client-id: {{ default "" .Values.concourse.genericOauthClientId | b64enc | quote }}
   generic-oauth-client-secret: {{ default "" .Values.concourse.genericOauthClientSecret | b64enc | quote }}
+  encryption-key: {{ default "" .Values.concourse.encryptionKey | b64enc | quote }}
+  old-encryption-key: {{ default "" .Values.concourse.oldEncryptionKey | b64enc | quote }}
diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml
index 87b01e5d92..092fb61ce7 100644
--- a/stable/concourse/templates/web-deployment.yaml
+++ b/stable/concourse/templates/web-deployment.yaml
@@ -51,6 +51,20 @@ spec:
                   name: {{ template "concourse.fullname" . }}
                   key: postgresql-uri
             {{ end }}
+            {{ if .Values.encryptionKey }}
+            - name: CONCOURSE_ENCRYPTION_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "concourse.fullname" . }}
+                  key: encryption-key
+            {{ end }}
+            {{ if .Values.oldEncryptionKey }}
+            - name: CONCOURSE_OLD_ENCRYPTION_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "concourse.fullname" . }}
+                  key: old-encryption-key
+            {{ end }}
             - name: POD_IP
               valueFrom:
                 fieldRef:
diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml
index 68321e04af..f67b5fe86e 100644
--- a/stable/concourse/values.yaml
+++ b/stable/concourse/values.yaml
@@ -136,6 +136,9 @@ concourse:
   workerKeyPub: |-
     ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC496FSYFcBAKgDtMsBAJiF/6/NxlXKP5UZecyEsedYuTt1GOgJTwaA1qZ1LmHsbfLDE68oDdiM4uvxfI4wtLhz57w3u0jOUxZ2JeF7SVwEf1nVqLn4Gh/f8GUNQGSyIp1zUD5Bx9fq0PAyQ47mt7Ufi84rcf8LKl7nzAIHTcdg2BvTkQN9bUGPaq/Pb1W2bKPAQy4OzXTSIyrAJ89TH2jFeaZfyxQFGbD9jVHH/yl0oiMrDeaRYgccE5II+KY7WoLjsBry/9Qf2ERELKTK4UeIGIqWci9lab1ti+GxFPPiC3krNFjo4jShV4eUs4cNIrjwNrxVaKPXmU6o7Y3Hpayx Concourse
 
+  oldEncryptionKey:
+  encryptionKey:
+
   ## ATC listen port.
   ## ref: https://concourse.ci/architecture.html
   ##