diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 701dc35..203c763 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -1,19 +1,24 @@
 applications:
 - elasticsearch
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     client:
       enabled: true
       index:
         log:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_log.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_log.json
         audit:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_audit.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_audit.json
         notification:
+          force_operation: true
           enabled: true
-          template: elasticsearch/files/es_template_notification.json
-        kibana4:
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_notification.json
+        kibana:
           enabled: true
-          template: elasticsearch/files/es_template_kibana4.json
+          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_kibana.json