diff --git a/upstreamed/external-dns/Chart.yaml b/upstreamed/external-dns/Chart.yaml
index 982bb1919..ecf078ece 100644
--- a/upstreamed/external-dns/Chart.yaml
+++ b/upstreamed/external-dns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: external-dns
-version: 2.3.3
+version: 2.4.0
 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/upstreamed/external-dns/README.md b/upstreamed/external-dns/README.md
index 09ba113a6..36a8f3b46 100644
--- a/upstreamed/external-dns/README.md
+++ b/upstreamed/external-dns/README.md
@@ -66,6 +66,7 @@ The following table lists the configurable parameters of the external-dns chart
 | `aws.zoneType`                     | When using the AWS provider, filter for zones of this type (optional, options: public, private)          | `""`                                                     |
 | `aws.assumeRoleArn`                | When using the AWS provider, assume role by specifying --aws-assume-role to the external-dns daemon      | `""`                                                     |
 | `aws.batchChangeSize`              | When using the AWS provider, set the maximum number of changes that will be applied in each batch        | `1000`                                                   |
+| `aws.zoneTags`                     | When using the AWS provider, filter for zones with these tags                                            | `[]`                                                     |
 | `azure.secretName`                 | When using the Azure provider, set the secret containing the `azure.json` file                           | `""`                                                     |
 | `azure.resourceGroup`               | When using the Azure provider, set the Azure Resource Group                                              | `""`                                                     |
 | `cloudflare.apiKey`                | When using the Cloudflare provider, `CF_API_KEY` to set (optional)                                       | `""`                                                     |
diff --git a/upstreamed/external-dns/templates/deployment.yaml b/upstreamed/external-dns/templates/deployment.yaml
index 2e3d59824..6462fac1d 100755
--- a/upstreamed/external-dns/templates/deployment.yaml
+++ b/upstreamed/external-dns/templates/deployment.yaml
@@ -104,6 +104,9 @@ spec:
         - --aws-batch-change-size={{ .Values.aws.batchChangeSize }}
         {{- end }}
         {{- end }}
+        {{- range .Values.aws.zoneTags }}
+        - --aws-zone-tags={{ . }}
+        {{- end }}
         # Azure Arguments
         {{- if eq .Values.provider "azure" }}
         {{- if .Values.azure.resourceGroup }}
diff --git a/upstreamed/external-dns/values-production.yaml b/upstreamed/external-dns/values-production.yaml
index 9df69898d..c94056eb5 100644
--- a/upstreamed/external-dns/values-production.yaml
+++ b/upstreamed/external-dns/values-production.yaml
@@ -71,6 +71,9 @@ aws:
   ## Maximum number of changes that will be applied in each batch
   ##
   batchChangeSize: 1000
+  ## Zone Tag Filter
+  ##
+  zoneTags: []
 
 ## Azure configuration to be set via arguments/env. variables
 ##
diff --git a/upstreamed/external-dns/values.yaml b/upstreamed/external-dns/values.yaml
index 469bb0976..23e76879f 100644
--- a/upstreamed/external-dns/values.yaml
+++ b/upstreamed/external-dns/values.yaml
@@ -71,6 +71,9 @@ aws:
   ## Maximum number of changes that will be applied in each batch
   ##
   batchChangeSize: 1000
+  ## AWS Zone tags
+  ##
+  zoneTags: []
 
 ## Azure configuration to be set via arguments/env. variables
 ##