diff --git a/salt/filebeat/etc/filebeat.yml b/salt/filebeat/etc/filebeat.yml
index 5affc2411..3aa8fa565 100644
--- a/salt/filebeat/etc/filebeat.yml
+++ b/salt/filebeat/etc/filebeat.yml
@@ -226,7 +226,7 @@ output.elasticsearch:
   # Client Certificate Key
   #ssl.key: "/usr/share/filebeat/filebeat.key"
 
-
+setup.template.enabled: false
   # A dictionary of settings to place into the settings.index dictionary
   # of the Elasticsearch template. For more details, please check
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html
diff --git a/salt/logstash/pipelines/templates/so/so-beats-template.json b/salt/logstash/pipelines/templates/so/so-beats-template.json
index f6a9c2d27..858f1d5e5 100644
--- a/salt/logstash/pipelines/templates/so/so-beats-template.json
+++ b/salt/logstash/pipelines/templates/so/so-beats-template.json
@@ -2,8 +2,7 @@
   "index_patterns": [
     "so-beats-*"
   ],
-  "mappings": {
-    "doc": {
+    "mappings": {
       "_meta": {
         "version": "6.1.3"
       },
@@ -1265,12 +1264,11 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 }
-              }
-            }
-          }
-        }
-      }
-    }
+             }
+           }
+         }
+       }
+     }
   },
   "order": 1,
   "settings": {
diff --git a/salt/logstash/pipelines/templates/so/so-common-template.json b/salt/logstash/pipelines/templates/so/so-common-template.json
index 90241924f..295653dfa 100644
--- a/salt/logstash/pipelines/templates/so/so-common-template.json
+++ b/salt/logstash/pipelines/templates/so/so-common-template.json
@@ -8,7 +8,6 @@
     "index.refresh_interval":"30s"
   },
   "mappings":{
-    "doc":{
        "dynamic": false,
        "date_detection": false,
        "properties":{
@@ -349,7 +348,6 @@
           "type":"object",
           "dynamic": true
         }
-      }
-    }
+     }
   }
 }