diff --git a/salt/elasticsearch/templates/component/elastic-agent/so-fleet_agent_id_verification-1.json b/salt/elasticsearch/templates/component/elastic-agent/so-fleet_agent_id_verification-1.json
index 18c6f1d6d..55e3e921c 100644
--- a/salt/elasticsearch/templates/component/elastic-agent/so-fleet_agent_id_verification-1.json
+++ b/salt/elasticsearch/templates/component/elastic-agent/so-fleet_agent_id_verification-1.json
@@ -9,6 +9,10 @@
       "properties": {
         "event": {
           "properties": {
+            "agent_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
             "agent_id_status": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -18,6 +22,10 @@
               "type": "date"
             }
           }
+        },
+        "tags": {
+          "ignore_above": 1024,
+          "type": "keyword"
         }
       }
     }