diff --git a/charts/argo/templates/workflow-controller-config-map.yaml b/charts/argo/templates/workflow-controller-config-map.yaml
index 068b381c..14d49935 100644
--- a/charts/argo/templates/workflow-controller-config-map.yaml
+++ b/charts/argo/templates/workflow-controller-config-map.yaml
@@ -16,10 +16,14 @@ data:
     {{- end }}
     {{- end }}
     containerRuntimeExecutor: {{ .Values.controller.containerRuntimeExecutor }}
-    {{- with .Values.executor.resources }}
+    {{- if or .Values.executor.resources .Values.executor.env }}
     executor:
-      resources:
-        {{- toYaml . | nindent 8 }}
+      {{- with .Values.executor.resources }}
+      resources: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.executor.env }}
+      env: {{- toYaml . | nindent 8 }}
+      {{- end }}
     {{- end }}
     artifactRepository:
       {{- if or .Values.minio.install .Values.useDefaultArtifactRepo }}
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 156f9926..7ab0aae5 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -111,6 +111,8 @@ executor:
     # Overrides .images.tag if defined.
     tag: ""
   resources: {}
+  # Adds environment variables for the executor.
+  env: {}
 
 server:
   enabled: true