diff --git a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticSearchTemplateProvider.cs b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticSearchTemplateProvider.cs
index 3f52d0f6..d0438f9a 100644
--- a/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticSearchTemplateProvider.cs
+++ b/src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticSearchTemplateProvider.cs
@@ -114,7 +114,7 @@ private static object GetTemplateESv6(
                         },
                         properties = new Dictionary<string, object>
                         {
-                            {"message", new {type = "text", index = "analyzed"}},
+                            {"message", new {type = "text", index = "true"}},
                             {
                                 "exceptions", new
                                 {
@@ -124,8 +124,8 @@ private static object GetTemplateESv6(
                                         {"Depth", new {type = "integer"}},
                                         {"RemoteStackIndex", new {type = "integer"}},
                                         {"HResult", new {type = "integer"}},
-                                        {"StackTraceString", new {type = "text", index = "analyzed"}},
-                                        {"RemoteStackTraceString", new {type = "text", index = "analyzed"}},
+                                        {"StackTraceString", new {type = "text", index = "true"}},
+                                        {"RemoteStackTraceString", new {type = "text", index = "true"}},
                                         {
                                             "ExceptionMessage", new
                                             {
diff --git a/test/Serilog.Sinks.Elasticsearch.Tests/Templating/template_v6.json b/test/Serilog.Sinks.Elasticsearch.Tests/Templating/template_v6.json
index f604151e..909cc9a5 100644
--- a/test/Serilog.Sinks.Elasticsearch.Tests/Templating/template_v6.json
+++ b/test/Serilog.Sinks.Elasticsearch.Tests/Templating/template_v6.json
@@ -39,7 +39,7 @@
             "properties": {
                 "message": {
                     "type": "text",
-                    "index": "analyzed"
+                    "index": "true"
                 },
                 "exceptions": {
                     "type": "nested",
@@ -55,11 +55,11 @@
                         },
                         "StackTraceString": {
                             "type": "text",
-                            "index": "analyzed"
+                            "index": "true"
                         },
                         "RemoteStackTraceString": {
                             "type": "text",
-                            "index": "analyzed"
+                            "index": "true"
                         },
                         "ExceptionMessage": {
                             "type": "object",