diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
index 1d2468beb5a..9030022bc67 100644
--- a/filebeat/docs/fields.asciidoc
+++ b/filebeat/docs/fields.asciidoc
@@ -49751,6 +49751,8 @@ example: kibana
 --
 Used by Elasticsearch to throttle and deduplicate deprecation warnings
 
+type: keyword
+
 example: v7app
 
 --
@@ -49760,6 +49762,8 @@ example: v7app
 --
 Category of the deprecation event
 
+type: keyword
+
 example: compatible_api
 
 --
diff --git a/filebeat/module/elasticsearch/_meta/fields.yml b/filebeat/module/elasticsearch/_meta/fields.yml
index 3cb88baf881..8ae4789d929 100644
--- a/filebeat/module/elasticsearch/_meta/fields.yml
+++ b/filebeat/module/elasticsearch/_meta/fields.yml
@@ -47,6 +47,8 @@
         - name: http.request.x_opaque_id
           description: "Used by Elasticsearch to throttle and deduplicate deprecation warnings"
           example: "v7app"
+          type: keyword
         - name: event.category
           description: "Category of the deprecation event"
           example: "compatible_api"
+          type: keyword
diff --git a/filebeat/module/elasticsearch/fields.go b/filebeat/module/elasticsearch/fields.go
index 597911929e8..525d0c50eac 100644
--- a/filebeat/module/elasticsearch/fields.go
+++ b/filebeat/module/elasticsearch/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetElasticsearch returns asset data.
 // This is the base64 encoded zlib format compressed contents of module/elasticsearch.
 func AssetElasticsearch() string {
-	return "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"
+	return "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"
 }