diff --git a/salt/elasticsearch/templates/component/elastic-agent/logs-system.syslog@custom.json b/salt/elasticsearch/templates/component/elastic-agent/logs-system.syslog@custom.json
index 17319ab9f..95a902bb9 100644
--- a/salt/elasticsearch/templates/component/elastic-agent/logs-system.syslog@custom.json
+++ b/salt/elasticsearch/templates/component/elastic-agent/logs-system.syslog@custom.json
@@ -2,7 +2,14 @@
   "template": {
     "mappings": {
       "properties": {
-        "host": {
+        "error": {
+          "properties": {
+            "message": {
+              "type": "match_only_text"
+            }
+	  }
+	},
+	"host": {
 	  "properties":{
             "ip": {
               "type": "ip"
@@ -32,5 +39,12 @@
         }
       }
     }
+  },
+  "_meta": {
+    "package": {
+      "name": "system"
+    },
+    "managed_by": "fleet",
+    "managed": true
   }
 }