diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index cc1e5e1..35e4375 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -3,89 +3,89 @@
 parameters:
   _param:
     kibana_client_default_index: index-template-log
-    kibana_version: 5
   kibana:
     client:
       enabled: true
       default_index: ${_param:kibana_client_default_index}
+      version: ${_param:kibana_version}
       object:
         logs:
           enabled: true
-          template: kibana/files/objects/dashboard_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/dashboard_logs.json
           type: dashboard
         notifications:
           enabled: true
-          template: kibana/files/objects/dashboard_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/dashboard_notifications.json
           type: dashboard
         index-template-log:
           enabled: true
-          template: kibana/files/objects/index-pattern_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_logs.json
           type: index-pattern
         index-template-notification:
           enabled: true
-          template: kibana/files/objects/index-pattern_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_notifications.json
           type: index-pattern
         index-template-audit:
           enabled: true
-          template: kibana/files/objects/index-pattern_audit.json
+          template: kibana/files/v${_param:kibana_version}/objects/index-pattern_audit.json
           type: index-pattern
         search-logs:
           enabled: true
-          template: kibana/files/objects/search_logs.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_logs.json
           type: search
         search-notifications:
           enabled: true
-          template: kibana/files/objects/search_notifications.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_notifications.json
           type: search
         search-audit:
           enabled: true
-          template: kibana/files/objects/search_audit.json
+          template: kibana/files/v${_param:kibana_version}/objects/search_audit.json
           type: search
         LOG-MESSAGES-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
           type: visualization
         LOG-MESSAGES-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
           type: visualization
         NUMBER-OF-LOG-MESSAGES-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
           type: visualization
         TOP-10-HOSTS:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-HOSTS.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-HOSTS.json
           type: visualization
         TOP-10-PROGRAMS:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-PROGRAMS.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-PROGRAMS.json
           type: visualization
         TOP-10-SOURCES:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-SOURCES.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_TOP-10-SOURCES.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
           type: visualization
         EVENT-TYPE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_EVENT-TYPE-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_EVENT-TYPE-BREAKDOWN.json
           type: visualization
         SOURCE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_SOURCE-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_SOURCE-BREAKDOWN.json
           type: visualization
         HOST-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_HOST-BREAKDOWN.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_HOST-BREAKDOWN.json
           type: visualization
         NOTIFICATIONS-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-PER-SEVERITY.json
+          template: kibana/files/v${_param:kibana_version}/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
           type: visualization
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 5ec45fd..7dbc97d 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,8 +3,6 @@
 classes:
 - service.kibana.support
 parameters:
-  _param:
-    kibana_version: 5
   kibana:
     server:
       enabled: true