diff --git a/salt/elasticsearch/templates/component/so/dtc-base-mappings.json b/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
index aa89e8876..8211dc2e2 100644
--- a/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
+++ b/salt/elasticsearch/templates/component/so/dtc-base-mappings.json
@@ -9,8 +9,9 @@
         "message": {
           "type": "match_only_text",
           "fields": {
-            "text": {
-              "type": "match_only_text"
+            "security": {
+              "type": "text",
+              "analyzer": "es_security_analyzer"
             },
             "keyword": {
               "type": "keyword"
@@ -21,10 +22,11 @@
           "ignore_above": 1024,
           "type": "keyword",
           "fields": {
-            "text": {
-              "type": "match_only_text"
+            "security": {
+              "type": "text",
+              "analyzer": "es_security_analyzer"
             },
-            "keyword": {
+	    "keyword": {
               "type": "keyword"
             }
           }