diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
index 21e7656..f2e007c 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
@@ -25,6 +25,7 @@
       master:
         host: ${_param:salt_syndic_master_address}
     master:
+      worker_threads: 40
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
@@ -43,7 +44,7 @@
         infra_config:
           expression:
           - <<node_hostname>>__startswith__cfg
-          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          - <<node_cluster>>__equals__k8s-ha-calico-syndic
           cluster_param:
             infra_config_address:
               value_template: <<node_control_ip>>
@@ -54,28 +55,28 @@
         kubernetes_control01:
           expression:
           - <<node_hostname>>__equals__ctl01
-          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          - <<node_cluster>>__equals__k8s-ha-calico-syndic
           cluster_param:
             kubernetes_control_node01_address:
               value_template: <<node_control_ip>>
         kubernetes_control02:
           expression:
           - <<node_hostname>>__equals__ctl02
-          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          - <<node_cluster>>__equals__k8s-ha-calico-syndic
           cluster_param:
             kubernetes_control_node02_address:
               value_template: <<node_control_ip>>
         kubernetes_control03:
           expression:
           - <<node_hostname>>__equals__ctl03
-          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          - <<node_cluster>>__equals__k8s-ha-calico-syndic
           cluster_param:
             kubernetes_control_node03_address:
               value_template: <<node_control_ip>>
         kubernetes_compute:
           expression:
           - <<node_hostname>>__startswith__cmp
-          - <<node_cluster>>__equals__k8s_ha_calico_syndic
+          - <<node_cluster>>__equals__k8s-ha-calico-syndic
           node_class:
             value_template:
               - cluster.<<node_cluster>>.kubernetes.compute
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 909871e..4c68509 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.elasticsearch.5
+- system.linux.system.repo.kibana.5
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index bb10d07..5464309 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.elasticsearch.5
+- system.linux.system.repo.kibana.5
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index d973d5c..a834c6d 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.elasticsearch.5
+- system.linux.system.repo.kibana.5
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 7d72aac..f5e9153 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -1,8 +1,8 @@
 classes:
 - system.docker.host
 - system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.elasticsearch.5
+- system.linux.system.repo.kibana.5
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.docker
 - system.elasticsearch.server.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-dvr/stacklight/server.yml
index fffdcf4..0f278aa 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.influxdb
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail-nfv/stacklight/server.yml
index 33b5b3a..bbcf491 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.collectd.remote_client.cluster
 - system.heka.remote_collector.cluster
 - system.heka.remote_collector.input.amqp
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 4c1e90a..818e360 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 38a6f3b..d151d16 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
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 a5b9930..a1bcd3d 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index f427930..1a4ce9a 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.docker
 # Needed to install Galera packages
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 633190b..90f53cf 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/stacklight/server.yml
index bf50f8d..bb730fa 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs-ironic/stacklight/server.yml
index 668f808..6823f91 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp11-ovs/stacklight/server.yml
index 77edc3c..1409b9e 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.elasticsearch
-- system.linux.system.repo.kibana
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single