diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index bd0ebb7..a27bde9 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -57,4 +57,4 @@
           - ${linux:system:name}
       hyperkube:
         image: ${_param:kubernetes_hyperkube_image}
-#        pause_image: ${_param:kubernetes_pause_image}
+
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 1fde55f..e97eede 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -13,7 +13,8 @@
 - cluster.overrides
 parameters:
   _param:
-    keepalived_vip_interface: ens4
+    keepalived_k8s_apiserver_vip_interface: ens4
+    keepalived_k8s_apiserver_vip_address: ${_param:kubernetes_control_address}
 
   linux:
     network:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 0afecc3..7932ac2 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -21,8 +21,8 @@
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # component docker images
-    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
-    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.13-11
+    kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.8.13-11
     kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
     kubernetes_criproxy_version: v0.10.0
     kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index 4dfad76..a1e3f0b 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -11,7 +11,6 @@
 - system.opencontrail.client.resource.config_node
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
-- system.opencontrail.client.resource.global_vrouter_config
 - system.opencontrail.client.resource.k8s_api
 - system.haproxy.proxy.listen.opencontrail.analytics
 - cluster.k8s-ha-contrail-40.infra
@@ -75,4 +74,6 @@
         engine: k8s
         host: none
       bind:
-        address: ${_param:single_address}
\ No newline at end of file
+        address: ${_param:single_address}
+      master:
+        host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
index 3a29757..4ec9301 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/init.yml
@@ -25,3 +25,6 @@
     openstack_version: none
     openstack_control_address: none
     keystone_admin_password: none
+
+    keepalived_vip_interface: ens4
+    keepalived_vip_address: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 9a7a236..cf74de2 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -1,7 +1,7 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
@@ -45,6 +45,7 @@
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_image_alerta: docker-prod-virtual.docker.mirantis.net/mirantis/external/alerta-web:${_param:apt_mk_version}
+    elasticsearch_version: 5
     docker_influxdb_image: influxdb:1.2
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
@@ -62,6 +63,7 @@
     cluster_node03_address: ${_param:stacklight_node03_address}
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    kibana_version: 5
     # Galera
     openstack_version: newton
     galera_innodb_buffer_pool_size: 1024M
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index ee6e15e..66f422a 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -37,7 +37,9 @@
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index 648d2e0..678645c 100644
--- a/classes/cluster/sl-pike-dvr/stacklight/server.yml
+++ b/classes/cluster/sl-pike-dvr/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
@@ -39,6 +39,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
index 7a79a07..bb9e88b 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
@@ -27,6 +27,8 @@
 parameters:
   _param:
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: eth1
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
index f958148..c2bb0c3 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
@@ -27,6 +27,8 @@
 parameters:
   _param:
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
index 2f073e8..288acfe 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: eth1
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
index 6c50766..9980eac 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
index 9b2dd5e..33460a6 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
@@ -27,6 +27,8 @@
 parameters:
   _param:
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
index 88ea159..4c12333 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
index 8a077e5..6f32f5f 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo_local.mcp.apt_mirantis.influxdb
-- system.linux.system.repo_local.mcp.apt_mirantis.elastic
-- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index 3e8887c..b86bac7 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
index ab0817a..205e43d 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo_local.mcp.apt_mirantis.influxdb
-- system.linux.system.repo_local.mcp.apt_mirantis.elastic
-- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
index 0c56d52..230f355 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
index ce7f493..33324af 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
index 17f0c74..6e5af3a 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -32,6 +32,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
index fb55453..6f0f8a4 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -31,6 +31,8 @@
 parameters:
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml
index bbcf491..a0be7b7 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.system.repo.grafana
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.collectd.remote_client.cluster
 - system.heka.remote_collector.cluster
 - system.heka.remote_collector.input.amqp
@@ -24,6 +24,8 @@
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_message_queue_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_password: 'password'
     keepalived_stacklight_monitor_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index dea0438..ce4bdc9 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 26518f9..1dc0b38 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 80c253d..b9837cd 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -1,7 +1,7 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
@@ -32,6 +32,7 @@
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
+    elasticsearch_version: 5
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -45,6 +46,7 @@
     cluster_node03_address: ${_param:stacklight_node03_address}
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    kibana_version: 5
     # Galera
     openstack_version: newton
     galera_innodb_buffer_pool_size: 1024M
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 9395aab..441df3c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -1,7 +1,7 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
@@ -46,6 +46,7 @@
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
     docker_influxdb_image: influxdb:1.2
+    elasticsearch_version: 5
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -62,6 +63,7 @@
     cluster_node03_address: ${_param:stacklight_node03_address}
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    kibana_version: 5
     # Galera
     openstack_version: newton
     galera_innodb_buffer_pool_size: 1024M
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index a8c2e44..dc3ffea 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
@@ -45,6 +45,7 @@
     docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:${_param:apt_mk_version}
     docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:${_param:apt_mk_version}
     docker_image_grafana: docker-prod-virtual.docker.mirantis.net/mirantis/external/grafana:${_param:apt_mk_version}
+    elasticsearch_version: 5
     grafana_admin_password: admin
     keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
     keepalived_prometheus_vip_password: password
@@ -59,6 +60,7 @@
     grafana_database_password: ${_param:mysql_grafana_password}
     # Kibana
     kibana_elasticsearch_host: ${_param:cluster_vip_address}
+    kibana_version: 5
     # Docker/Elasticsearch
     cluster_elasticsearch_port: 9200
     cluster_kibana_port: 5601
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml
index bb730fa..0d42d6e 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.influxdb
 - system.heka.remote_collector.input.amqp
 - system.heka.aggregator.cluster
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -22,6 +22,8 @@
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_password: 'password'
     keepalived_stacklight_monitor_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
index 75f3ad2..d78b873 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/stacklight/server.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.influxdb
 - system.heka.remote_collector.input.amqp
 - system.heka.aggregator.cluster
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -22,6 +22,8 @@
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_password: 'password'
     keepalived_stacklight_monitor_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml
index 6823f91..b9a6618 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.influxdb
 - system.heka.remote_collector.input.amqp
 - system.heka.aggregator.cluster
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -21,6 +21,8 @@
   _param:
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_password: 'password'
diff --git a/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml
index 1409b9e..ed1c098 100644
--- a/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.influxdb
 - system.heka.remote_collector.input.amqp
 - system.heka.aggregator.cluster
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
@@ -21,6 +21,8 @@
   _param:
     collectd_remote_collector_host: ${_param:stacklight_monitor_address}
     heka_amqp_host: ${_param:openstack_control_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
     keepalived_stacklight_monitor_vip_password: 'password'
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml
index 4b2f516..369c95f 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo_local.mcp.apt_mirantis.influxdb
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.elastic
-- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
index e9f6bcb..4ecc914 100644
--- a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
@@ -2,8 +2,8 @@
 - system.docker.host
 - system.linux.system.repo_local.mcp.apt_mirantis.influxdb
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.elastic
-- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic.5x
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
 - system.linux.system.repo_local.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
@@ -33,6 +33,8 @@
   _param:
     heka_amqp_host: ${_param:openstack_control_address}
     kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+    elasticsearch_version: 5
+    kibana_version: 5
     keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
     keepalived_prometheus_vip_password: 'password'
     keepalived_prometheus_vip_interface: ens4
diff --git a/classes/system b/classes/system
index 8d46284..7f8c2f3 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 8d46284f4cf6457d4d99d631dca26f4aaed71b45
+Subproject commit 7f8c2f32dfa4fee69d3b1dbe2ad2a1e7f32bdb1e