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
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index e432f74..2ff8db5 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 0.0.0.0
         port: 9200
diff --git a/metadata/service/server/local.yml b/metadata/service/server/local.yml
index 259f468..24f577e 100644
--- a/metadata/service/server/local.yml
+++ b/metadata/service/server/local.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 127.0.0.1
         port: 9200
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 264186c..397a0b6 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,9 +3,12 @@
 classes:
 - service.elasticsearch.support
 parameters:
+  _param:
+    elasticsearch_version: 2
   elasticsearch:
     server:
       enabled: true
+      version: ${_param:elasticsearch_version}
       bind:
         address: 0.0.0.0
         port: 9200