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