diff --git a/stable/external-dns/Chart.yaml b/stable/external-dns/Chart.yaml
index ecf078ece5..60536d0409 100644
--- a/stable/external-dns/Chart.yaml
+++ b/stable/external-dns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: external-dns
-version: 2.4.0
+version: 2.4.1
 appVersion: 0.5.15
 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
 keywords:
diff --git a/stable/external-dns/templates/deployment.yaml b/stable/external-dns/templates/deployment.yaml
index 6462fac1d6..2ea68596e5 100755
--- a/stable/external-dns/templates/deployment.yaml
+++ b/stable/external-dns/templates/deployment.yaml
@@ -254,17 +254,8 @@ spec:
               key: pdns_api_key
         {{- end }}
         # Extra environment variables
-        {{- $root := . -}}
-        {{- range .Values.extraEnv }}
-        - name: {{ .name }}
-          valueFrom:
-            {{- if .valueFrom }}
-{{ toYaml .valueFrom | indent 12 }}
-            {{- else }}
-            secretKeyRef:
-              name: {{ template "external-dns.fullname" $root }}
-              key: {{ .name }}
-            {{- end }}
+        {{- if .Values.extraEnv }}
+        {{ toYaml .Values.extraEnv | nindent 8 }}
         {{- end }}
         ports:
         - name: http
diff --git a/stable/external-dns/templates/secret.yaml b/stable/external-dns/templates/secret.yaml
index 56d54f751e..2f8e794d14 100644
--- a/stable/external-dns/templates/secret.yaml
+++ b/stable/external-dns/templates/secret.yaml
@@ -33,7 +33,4 @@ data:
   {{- if .Values.pdns.apiKey }}
   pdns_api_key: {{ .Values.pdns.apiKey | b64enc | quote }}
   {{- end }}
-  {{- range $key, $value := .Values.extraEnv }}
-  {{ $key }}: {{ $value | b64enc | quote }}
-  {{- end }}
 {{- end }}
diff --git a/stable/external-dns/values-production.yaml b/stable/external-dns/values-production.yaml
index c94056eb52..eade26b5ee 100644
--- a/stable/external-dns/values-production.yaml
+++ b/stable/external-dns/values-production.yaml
@@ -209,9 +209,17 @@ istioIngressGateways: []
 ## Extra Arguments to passed to external-dns
 ##
 extraArgs: {}
-## Extra env. variable to set on external-dns container
+## Extra env. variable to set on external-dns container.
 ##
-extraEnv: {}
+## extraEnv:
+## - name: VARNAME1
+##   value: value1
+## - name: VARNAME2
+##   valueFrom:
+##     secretKeyRef:
+##       name: existing-secret
+##       key: varname2-key
+extraEnv: []
 
 ## Replica count
 ##
diff --git a/stable/external-dns/values.yaml b/stable/external-dns/values.yaml
index 23e76879f6..9f5808ef57 100644
--- a/stable/external-dns/values.yaml
+++ b/stable/external-dns/values.yaml
@@ -209,9 +209,17 @@ istioIngressGateways: []
 ## Extra Arguments to passed to external-dns
 ##
 extraArgs: {}
-## Extra env. variable to set on external-dns container
+## Extra env. variable to set on external-dns container.
 ##
-extraEnv: {}
+## extraEnv:
+## - name: VARNAME1
+##   value: value1
+## - name: VARNAME2
+##   valueFrom:
+##     secretKeyRef:
+##       name: existing-secret
+##       key: varname2-key
+extraEnv: []
 
 ## Replica count
 ##