diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index b5b4729..6553a8e 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.5x
-- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
 - system.linux.system.repo.mcp.apt_mirantis.openstack
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index cac402c..cf7cd94 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -1,9 +1,9 @@
 classes:
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.docker
 # Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mriantis.openstack
 - system.docker.host
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
diff --git a/classes/cluster/sl-os-contrail/stacklight/server.yml b/classes/cluster/sl-os-contrail/stacklight/server.yml
index 8cd2552..6022caf 100755
--- a/classes/cluster/sl-os-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-os-contrail/stacklight/server.yml
@@ -1,10 +1,10 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
-- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
diff --git a/classes/cluster/sl-os-ovs/stacklight/server.yml b/classes/cluster/sl-os-ovs/stacklight/server.yml
index 62eaf87..8a1a7cc 100644
--- a/classes/cluster/sl-os-ovs/stacklight/server.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/server.yml
@@ -1,10 +1,10 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.docker
+- 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.openstack
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
diff --git a/classes/cluster/sl-pike-dvr/stacklight/server.yml b/classes/cluster/sl-pike-dvr/stacklight/server.yml
index fa6f3c7..626b5dd 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.5x
-- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.mcp.apt_mirantis.docker
 - system.linux.system.repo.docker
 - system.heka.remote_collector.container
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 143b0d6..1cc7c51 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
@@ -1,10 +1,10 @@
 classes:
 - system.docker.host
-- system.linux.system.repo.influxdb
-- 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.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.elasticsearch.server.cluster
 - system.elasticsearch.server.curator
 - system.kibana.server.single
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 0617038..a4656ff 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -2,9 +2,9 @@
 - system.docker.host
 - system.linux.system.repo.influxdb
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo.mcp.apt_mirantis.elastic.5x
-- system.linux.system.repo.mcp.apt_mirantis.kibana.5x
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.docker
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
index 36c6046..a556771 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
@@ -1,7 +1,7 @@
 classes:
   - system.linux.system.haveged
-  - system.linux.system.repo_local.mcp.apt_mirantis.docker
-  - system.linux.system.repo_local.mcp.extra
+  - system.linux.system.repo.mcp.apt_mirantis.docker
+  - system.linux.system.repo.mcp.apt_mirantis.extra
   - system.linux.system.repo.mcp.apt_mirantis.ubuntu
   - system.linux.system.repo.mcp.apt_mirantis.glusterfs
   - system.linux.system.repo.mcp.apt_mirantis.saltstack
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 645612b..5413b91 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -3,10 +3,9 @@
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.salt
-- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
 - system.glusterfs.client.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
index c0759e7..eb57f3f 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
@@ -1,10 +1,10 @@
 classes:
 - system.defaults
 - system.linux.network.dynamic_hosts
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.watchdog.server
@@ -18,6 +18,7 @@
 - cluster.virtual-offline-pike-ovs-dpdk.openstack
 - cluster.virtual-offline-pike-ovs-dpdk.cicd
 parameters:
+
   _param:
     cluster_domain: virtual-offline-pike-ovs-dpdk.local
     cluster_name: virtual-offline-pike-ovs-dpdk
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index 633c0ae..280bb35 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index a17ba89..0cb1570 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -1,10 +1,11 @@
 classes:
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
index 24f2b4b..47e3930 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-offline-pike-ovs-dpdk.infra
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
index afbe64b..ade8bb1 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -1,6 +1,6 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-pike-ovs-dpdk.infra
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
index c1c831b..f6828cc 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - cluster.virtual-offline-pike-ovs-dpdk.infra
 parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
index b664387..830b112 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
@@ -1,9 +1,9 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.apache.server.single
 - system.apache.server.site.gnocchi
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index 2ff558e..81b2e37 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -3,7 +3,7 @@
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.master.api
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs/infra/init.yml
index b01723d..8d53bd9 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.defaults
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index edbbe4d..3ba8b59 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -4,7 +4,7 @@
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
@@ -57,5 +57,4 @@
     stacklight_log_address: ${_param:stacklight_monitor_address}
     openstack_gateway_address: 172.16.10.110
     openstack_gateway_node01_address: ${_param:openstack_gateway_address}
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
index 6bcf8de..3b1d336 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index 7933f6e..4042eec 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -1,10 +1,11 @@
 classes:
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
index 74edf81..d1356ef 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-offline-pike-ovs
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
index de9e2ef..5448904 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
@@ -1,6 +1,6 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-pike-ovs
diff --git a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
index 4ecc914..3ffa917 100644
--- a/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/stacklight/server.yml
@@ -1,10 +1,11 @@
 classes:
 - 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.5x
-- system.linux.system.repo_local.mcp.apt_mirantis.kibana.5x
-- system.linux.system.repo_local.mcp.apt_mirantis.docker
+- system.linux.system.repo.mcp.apt_mirantis.extra
+- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
 - system.heka.remote_collector.container
 - system.heka.remote_collector.input.amqp
 - system.heka.remote_collector.output.elasticsearch
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index 013ef8b..7dc2280 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -3,7 +3,7 @@
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.salt.master.pkg
 - system.salt.master.api
 - system.salt.master.formula.pkg.manila
diff --git a/classes/cluster/virtual-offline-ssl/infra/init.yml b/classes/cluster/virtual-offline-ssl/infra/init.yml
index b01723d..8d53bd9 100644
--- a/classes/cluster/virtual-offline-ssl/infra/init.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/init.yml
@@ -1,3 +1,7 @@
+classes:
+- system.defaults
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 parameters:
   linux:
     network:
diff --git a/classes/cluster/virtual-offline-ssl/init.yml b/classes/cluster/virtual-offline-ssl/init.yml
index 982c5cc..f9b252d 100644
--- a/classes/cluster/virtual-offline-ssl/init.yml
+++ b/classes/cluster/virtual-offline-ssl/init.yml
@@ -1,7 +1,7 @@
 classes:
 - system.defaults
 - system.linux.network.dynamic_hosts
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index dc75093..6cde820 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -1,8 +1,7 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.network.hosts
 - system.linux.storage.loopback
 - system.nova.compute.cluster
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index b196b83..aa7010a 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -2,10 +2,11 @@
 - system.salt.minion.cert.proxy
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
index b897c93..51bb0cf 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.horizon.server.single
 - cluster.virtual-offline-ssl
 parameters:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/gateway.yml b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
index 98321cc..8fa9924 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
@@ -1,6 +1,6 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-ssl
@@ -85,4 +85,4 @@
           use_interfaces:
           - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
\ No newline at end of file
+          - float-to-ex
diff --git a/classes/cluster/virtual-offline-ssl/openstack/share.yml b/classes/cluster/virtual-offline-ssl/openstack/share.yml
index 1d083f3..0a49abe 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/share.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.system.lowmem
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.storage.loopback_manila
 - system.manila.share
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
index a59b9a7..a3d8230 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -1,10 +1,10 @@
 classes:
 - system.salt.minion.cert.proxy
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.apache.server.single
 - system.apache.server.site.gnocchi