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 d0b124d..1465125 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -2,7 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.single.debian
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 #- system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 1ebd750..ebf843d 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -4,8 +4,8 @@
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.watchdog.server
@@ -25,6 +25,9 @@
     cluster_name: virtual-offline-pike-ovs-dpdk
     infra_config_hostname: cfg01
     local_repos: true
+    # new in 2018.7+
+    linux_system_repo_url: http://${_param:local_repo_url}/${_param:apt_mk_version}/
+    #
     local_repo_url: mirror.mcp.mirantis.local.test
     linux_repo_refresh_db: true
     aptly_server_address: 10.170.0.226
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 2e0f028..e8a17b5 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.linux.network.hosts
 - system.nova.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 f6513bb..90f5f24 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -1,9 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
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 e8f77b5..2c20b03 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-offline-pike-ovs-dpdk
 parameters:
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 aaf8596..9e0e96a 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-pike-ovs-dpdk
 parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index e9e2616..a3b626b 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -2,7 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.single.debian
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 6e3b1fc..7b41e0b 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -4,8 +4,8 @@
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.linux.system.single.debian
@@ -25,6 +25,9 @@
     cluster_name: virtual-offline-pike-ovs
     infra_config_hostname: cfg01
     local_repos: true
+    # new in 2018.7+
+    linux_system_repo_url: http://${_param:local_repo_url}/${_param:apt_mk_version}/
+    #
     local_repo_url: mirror.mcp.mirantis.local.test
     linux_repo_refresh_db: true
     aptly_server_address: 10.170.0.226
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
index cb38f78..6bcf8de 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.linux.network.hosts
 - system.nova.compute.cluster
@@ -66,4 +66,4 @@
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:tenant_interface}
\ No newline at end of file
+          - ${_param:tenant_interface}
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index 36b8318..e7d4084 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -1,9 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
index 94862a8..74edf81 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.virtual-offline-pike-ovs
 parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
index 391dd3c..de9e2ef 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-pike-ovs
 parameters:
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index 1baf44b..c0a6e64 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -2,7 +2,7 @@
 - service.git.client
 - system.linux.system.single
 - system.linux.system.single.debian
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-offline-ssl/init.yml b/classes/cluster/virtual-offline-ssl/init.yml
index 642429d..791c70d 100644
--- a/classes/cluster/virtual-offline-ssl/init.yml
+++ b/classes/cluster/virtual-offline-ssl/init.yml
@@ -1,8 +1,8 @@
 classes:
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.single
 - system.linux.system.single.debian
 - system.rsyslog.client.single
@@ -20,6 +20,9 @@
     infra_config_hostname: cfg01
     infra_config_address: 172.16.10.100
     local_repos: true
+    # new in 2018.7+
+    linux_system_repo_url: http://${_param:local_repo_url}/${_param:apt_mk_version}/
+    #
     local_repo_url: mirror.mcp.mirantis.local.test
     linux_repo_refresh_db: true
     aptly_server_address: 10.170.0.226
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index a679f7b..87d472e 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.linux.network.hosts
 - system.linux.storage.loopback
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index a41851c..f2bddcc 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -1,10 +1,10 @@
 classes:
 - system.salt.minion.cert.proxy
 - system.linux.system.lowmem
-- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.ceph
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
index 2fd6219..b897c93 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_local.mcp.apt_mirantis.ubuntu
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - 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 9983260..98321cc 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
 - system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.virtual-offline-ssl
 parameters:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/share.yml b/classes/cluster/virtual-offline-ssl/openstack/share.yml
index 3156eb1..9a2d765 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/share.yml
@@ -1,9 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.storage.loopback_manila
 - system.manila.share
 - system.manila.share.backend.lvm
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
index 0a80203..1c36e8b 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -2,8 +2,8 @@
 - 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_local.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- 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.memcached.server.single
 - system.apache.server.single