diff --git a/docker/elk/logstash/dist/elasticsearch-template-es5x.json b/docker/elk/logstash/dist/elasticsearch-template-es5x.json
index 17bf366f..f02dfdb8 100644
--- a/docker/elk/logstash/dist/elasticsearch-template-es5x.json
+++ b/docker/elk/logstash/dist/elasticsearch-template-es5x.json
@@ -4,7 +4,12 @@
   "settings" : {
     "index.refresh_interval" : "5s",
     "index.number_of_shards" : "1",
-    "index.number_of_replicas" : "0"
+    "index.number_of_replicas" : "0",
+        "mapping" : {
+          "total_fields" : {
+            "limit" : "2000"
+          }
+        }
   },
   "mappings" : {
     "_default_" : {
diff --git a/docker/elk/logstash/dist/elasticsearch-template-es6x.json b/docker/elk/logstash/dist/elasticsearch-template-es6x.json
index 7a273eb5..aff190b9 100644
--- a/docker/elk/logstash/dist/elasticsearch-template-es6x.json
+++ b/docker/elk/logstash/dist/elasticsearch-template-es6x.json
@@ -4,7 +4,8 @@
   "settings" : {
     "index.refresh_interval" : "5s",
     "index.number_of_shards" : "1",
-    "index.number_of_replicas" : "0"
+    "index.number_of_replicas" : "0",
+    "index.mapping.total_fields.limit": "2000"
   },
   "mappings" : {
     "_default_" : {