diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index a3c8442a..e45ed5c5 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "v3.0.2"
 icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
index c35894ec..9f80ea7f 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml
@@ -70,7 +70,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
           {{- with .Values.controller.extraEnv }}
-            {{ toYaml . | nindent 10 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
diff --git a/charts/argo-workflows/templates/server/server-deployment.yaml b/charts/argo-workflows/templates/server/server-deployment.yaml
index 3a97a7fb..5effabf6 100644
--- a/charts/argo-workflows/templates/server/server-deployment.yaml
+++ b/charts/argo-workflows/templates/server/server-deployment.yaml
@@ -60,15 +60,18 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 20
           env:
-          - name: IN_CLUSTER
-            value: "true"
-          - name: ARGO_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: BASE_HREF
-            value: {{ .Values.server.baseHref | quote }}
+            - name: IN_CLUSTER
+              value: "true"
+            - name: ARGO_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+            - name: BASE_HREF
+              value: {{ .Values.server.baseHref | quote }}
+          {{- with .Values.server.extraEnv }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.server.resources | nindent 12 }}
           volumeMounts:
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index 684fe6cb..b78666a7 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -120,9 +120,13 @@ controller:
   # service type `LoadBalancer`
   loadBalancerSourceRanges: []
   resources: {}
-  # The list of environment variable definitions to be added to the controller
-  # manages container verbatim.
+
+  ## Extra environment variables to provide to the controller container
+  ## extraEnv:
+  ##   - name: FOO
+  ##     value: "bar"
   extraEnv: []
+
   # Extra arguments to be added to the controller
   extraArgs: []
   replicas: 1
@@ -226,6 +230,12 @@ server:
   # https://argoproj.github.io/argo-workflows/tls/
   secure: false
 
+  ## Extra environment variables to provide to the argo-server container
+  ## extraEnv:
+  ##   - name: FOO
+  ##     value: "bar"
+  extraEnv: []
+
   # Extra arguments to provide to the Argo server binary.
   extraArgs: []