diff --git a/docker/logstash/templates/wforce_template.json b/docker/logstash/templates/wforce_template.json
index b59bca31..6cc4ba74 100644
--- a/docker/logstash/templates/wforce_template.json
+++ b/docker/logstash/templates/wforce_template.json
@@ -1,42 +1,70 @@
-{ 
-    "index_patterns" : ["logstash-wforce*"],
-    "settings" : { "index.refresh_interval" : "5s"},
-    "mappings" : {
-            "dynamic_templates" :
-	    [
-	        {
-		    "minor_fields" : {
-		        "match" : "*minor",
-		        "mapping" : { "type" : "integer", "index" : true }
-		    }
-	        },
-	        {
-		    "major_fields" : {
-		        "match" : "*major",
-		        "mapping" : { "type" : "integer", "index" : true }
-		    }
-	        },
-	        {
-		    "string_fields" : {
-		        "match_mapping_type" : "string",
-		        "mapping" : { "type" : "keyword", "index" : true }
-		    }
-	        }
-	    ],
-            "properties" : {
-                "geoip"  : {
-                    "dynamic": true,
-                    "properties" : {
-                        "ip": { "type": "ip" },
-                        "location" : { "type" : "geo_point" },
-                        "latitude" : { "type" : "half_float" },
-                        "longitude" : { "type" : "half_float" }
-                    }
-                },
-	        "policy_reject": { "type": "boolean" },
-	        "success": { "type": "boolean"},
-	        "tls": { "type": "boolean" },
-	        "t": { "type": "float" }
-            }
-    }
+{
+	"index_patterns" : ["logstash-wforce*"],
+	"template": {
+		"settings": {
+			"index.refresh_interval": "5s"
+		},
+		"mappings": {
+			"dynamic_templates": [
+				{
+					"minor_fields": {
+						"match": "*minor",
+						"mapping": {
+							"type": "integer",
+							"index": true
+						}
+					}
+				},
+				{
+					"major_fields": {
+						"match": "*major",
+						"mapping": {
+							"type": "integer",
+							"index": true
+						}
+					}
+				},
+				{
+					"string_fields": {
+						"match_mapping_type": "string",
+						"mapping": {
+							"type": "keyword",
+							"index": true
+						}
+					}
+				}
+			],
+			"properties": {
+				"geoip": {
+					"dynamic": true,
+					"properties": {
+						"ip": {
+							"type": "ip"
+						},
+						"location": {
+							"type": "geo_point"
+						},
+						"latitude": {
+							"type": "half_float"
+						},
+						"longitude": {
+							"type": "half_float"
+						}
+					}
+				},
+				"policy_reject": {
+					"type": "boolean"
+				},
+				"success": {
+					"type": "boolean"
+				},
+				"tls": {
+					"type": "boolean"
+				},
+				"t": {
+					"type": "float"
+				}
+			}
+		}
+	}
 }