diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 85c8a281cf2..7762dba963e 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -78,6 +78,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add missing Kubernetes metadata fields to Filebeat CoreDNS module, and fix a documentation error. {pull}11591[11591]
 - Reduce memory usage if long lines are truncated to fit `max_bytes` limit. The line buffer is copied into a smaller buffer now. This allows the runtime to release unused memory earlier. {pull}11524[11524]
 - Fix timezone parsing of system module ingest pipelines. {pull}13308[13308]
+- Fix incorrect field references in envoyproxy dashboard {issue}13420[13420] {pull}13421[13421]
 
 *Heartbeat*
 
diff --git a/x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.json b/x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.json
index 979c6c09cb6..66bd869fcf7 100644
--- a/x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.json
+++ b/x-pack/filebeat/module/envoyproxy/_meta/kibana/7/dashboard/Filebeat-Envoyproxy-Overview.json
@@ -316,7 +316,7 @@
               "enabled": true,
               "id": "2",
               "params": {
-                "field": "url.domain.keyword",
+                "field": "url.domain",
                 "missingBucket": false,
                 "missingBucketLabel": "Missing",
                 "order": "desc",
@@ -431,7 +431,7 @@
               "enabled": true,
               "id": "2",
               "params": {
-                "field": "source.address.keyword",
+                "field": "source.address",
                 "missingBucket": false,
                 "missingBucketLabel": "Missing",
                 "order": "desc",
@@ -594,7 +594,7 @@
               "enabled": true,
               "id": "1",
               "params": {
-                "field": "url.domain.keyword"
+                "field": "url.domain"
               },
               "schema": "metric",
               "type": "cardinality"
@@ -730,7 +730,7 @@
               "enabled": true,
               "id": "2",
               "params": {
-                "field": "user_agent.name.keyword",
+                "field": "user_agent.name",
                 "missingBucket": false,
                 "missingBucketLabel": "Missing",
                 "order": "desc",
@@ -845,7 +845,7 @@
               "enabled": true,
               "id": "2",
               "params": {
-                "field": "envoyproxy.proxy_type.keyword",
+                "field": "envoyproxy.proxy_type",
                 "missingBucket": false,
                 "missingBucketLabel": "Missing",
                 "order": "desc",