diff --git a/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json b/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
index 539d0a22463..77e42b5385c 100644
--- a/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
+++ b/cluster/addons/fluentd-elasticsearch/es-image/template-k8s-logstash.json
@@ -1,22 +1,35 @@
 {
-  "template_k8s_logstash" : {
-    "template" : "logstash-*",
-    "settings" : {
-      "index.refresh_interval" : "5s"
-    },
-    "mappings" : {
-      "_default_" : {
-        "dynamic_templates" : [ {
-          "kubernetes_field" : {
-            "path_match" : "kubernetes.*",
-            "mapping" : {
-              "type" : "string",
-              "index" : "not_analyzed"
-            }
+  "template" : "logstash-*",
+  "settings" : {
+    "index.refresh_interval" : "5s"
+  },
+  "mappings" : {
+    "_default_" : {
+      "dynamic_templates" : [ {
+        "kubernetes_labels" : {
+          "path_match" : "kubernetes.labels",
+          "mapping" : {
+            "type" : "object",
+            "dynamic_templates" : [ {
+              "match_mapping_type": "string",
+              "path_match" : "*",
+              "mapping" : {
+                "type" : "string",
+                "index" : "not_analyzed"
+              }
+            } ]
           }
-        } ]
-      }
+        }
+      }, {
+        "kubernetes_field" : {
+          "match_mapping_type": "string",
+          "path_match" : "kubernetes.*",
+          "mapping" : {
+            "type" : "string",
+            "index" : "not_analyzed"
+          }
+        }
+      } ]
     }
   }
 }
-