diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 72efe86..9202012 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -1,24 +1,20 @@
 applications:
 - elasticsearch
 parameters:
-  _param:
-    elasticsearch_version: 5
   elasticsearch:
     client:
       enabled: true
+      version: ${_param:elasticsearch_version}
       index:
         log:
           force_operation: true
           enabled: true
-          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_log.json
+          template: elasticsearch/files/v${elasticsearch:client:version}/es_template_log.json
         audit:
           force_operation: true
           enabled: true
-          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_audit.json
+          template: elasticsearch/files/v${elasticsearch:client:version}/es_template_audit.json
         notification:
           force_operation: true
           enabled: true
-          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_notification.json
-        kibana:
-          enabled: true
-          template: elasticsearch/files/v${_param:elasticsearch_version}/es_template_kibana.json
+          template: elasticsearch/files/v${elasticsearch:client:version}/es_template_notification.json