diff --git a/classes/cluster/aaa-ha-freeipa/infra/config.yml b/classes/cluster/aaa-ha-freeipa/infra/config.yml
index da20586..eccd874 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/config.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.client.lab
 - system.salt.master.single
 - system.salt.master.git
@@ -94,5 +94,5 @@
           expression: <<node_hostname>>__startswith__tst
           node_class:
             value_template:
-              - system.linux.system.repo.ubuntu
+              - system.linux.system.repo.mcp.apt_mirantis.ubuntu
               - cluster.<<node_cluster>>.aaa.freeipa_client
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster/aaa-ha-freeipa/infra/init.yml
index 12e77b0..81fbfca 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
diff --git a/classes/cluster/ceph-ha/ceph/cephfs.yml b/classes/cluster/ceph-ha/ceph/cephfs.yml
index 0d474b0..7297884 100644
--- a/classes/cluster/ceph-ha/ceph/cephfs.yml
+++ b/classes/cluster/ceph-ha/ceph/cephfs.yml
@@ -1,3 +1,3 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - cluster.ceph-ha.infra
diff --git a/classes/cluster/ceph-ha/infra/config.yml b/classes/cluster/ceph-ha/infra/config.yml
index c2b73fc..768198b 100644
--- a/classes/cluster/ceph-ha/infra/config.yml
+++ b/classes/cluster/ceph-ha/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.salt.master.pkg
   #- system.salt.master.git
diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster/ceph-ha/infra/init.yml
index 3c13d80..a93dccc 100644
--- a/classes/cluster/ceph-ha/infra/init.yml
+++ b/classes/cluster/ceph-ha/infra/init.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt #FIXME
 - system.linux.system.repo.saltstack.xenial
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - cluster.ceph-ha.ceph
 - cluster.overrides
diff --git a/classes/cluster/k8s-aio-calico/infra/config.yml b/classes/cluster/k8s-aio-calico/infra/config.yml
index 63034f6..af1daaf 100644
--- a/classes/cluster/k8s-aio-calico/infra/config.yml
+++ b/classes/cluster/k8s-aio-calico/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-aio-calico/infra/init.yml b/classes/cluster/k8s-aio-calico/infra/init.yml
index 9d3b5c0..a599075 100644
--- a/classes/cluster/k8s-aio-calico/infra/init.yml
+++ b/classes/cluster/k8s-aio-calico/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
diff --git a/classes/cluster/k8s-aio-contrail/infra/config.yml b/classes/cluster/k8s-aio-contrail/infra/config.yml
index 2147a7f..71426ac 100644
--- a/classes/cluster/k8s-aio-contrail/infra/config.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index af57b51..94bfd0d 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
diff --git a/classes/cluster/k8s-compact/init.yml b/classes/cluster/k8s-compact/init.yml
index 7bafe50..a9491bb 100755
--- a/classes/cluster/k8s-compact/init.yml
+++ b/classes/cluster/k8s-compact/init.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.single
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.network.hosts
 parameters:
   _param:
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/infra/config.yml b/classes/cluster/k8s-ha-calico-cloudprovider/infra/config.yml
index 331de9d..ef55414 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
index 0c488ba..4a17154 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 parameters:
   _jenkins:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
index ef9ae97..2015b25 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
index e7a02fa..dec3602 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 parameters:
   _param:
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
index f2e007c..6f51f83 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
index 3637d1d..e129b05 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 parameters:
   _param:
diff --git a/classes/cluster/k8s-ha-calico/infra/config.yml b/classes/cluster/k8s-ha-calico/infra/config.yml
index 7e223f0..8c4731c 100644
--- a/classes/cluster/k8s-ha-calico/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index e1576a8..7f96520 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 parameters:
   _param:
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/config.yml b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
index 217a0fd..77d6b36 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/config.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.single
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/k8s-ha-contrail-40/infra/init.yml b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
index 1c3004f..e4ecc7f 100644
--- a/classes/cluster/k8s-ha-contrail-40/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
 - cluster.k8s-ha-contrail-40
diff --git a/classes/cluster/k8s-ha-contrail/infra/config.yml b/classes/cluster/k8s-ha-contrail/infra/config.yml
index d439773..eb6fbe0 100644
--- a/classes/cluster/k8s-ha-contrail/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/config.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.single
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/model-manager/model_manager/dashboard.yml b/classes/cluster/model-manager/model_manager/dashboard.yml
index db28c96..db4a614 100644
--- a/classes/cluster/model-manager/model_manager/dashboard.yml
+++ b/classes/cluster/model-manager/model_manager/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.network.hosts
diff --git a/classes/cluster/os-aio-contrail/openstack/dashboard.yml b/classes/cluster/os-aio-contrail/openstack/dashboard.yml
index 5e7c16f..a45f059 100755
--- a/classes/cluster/os-aio-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-aio-contrail/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-aio-ovs/openstack/dashboard.yml b/classes/cluster/os-aio-ovs/openstack/dashboard.yml
index 1995656..7faef18 100644
--- a/classes/cluster/os-aio-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-aio-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
index cac5ccd..9567d6e 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
index cdb2116..3a410db 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-contrail/openstack/dashboard.yml b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
index 1061456..625ac5c 100755
--- a/classes/cluster/os-ha-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml b/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
index d95f015..3e8272b 100644
--- a/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/cephfs.yml
@@ -1,3 +1,3 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - cluster.os-ha-ovs-ceph
\ No newline at end of file
diff --git a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
index f972948..bc79f5e 100644
--- a/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/os-ha-ovs-ceph/ceph/common.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.saltstack.xenial
 - system.linux.system.repo.ceph
 - cluster.os-ha-ovs-ceph.ceph
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
index ce7eae4..0a98537 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
index e12c636..a6531c0 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
index 4259946..02882ae 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/os-ha-ovs/openstack/dashboard.yml b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
index 45f54f8..9ed2ff7 100644
--- a/classes/cluster/os-ha-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index d1b447a..f96ac1e 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -1,7 +1,7 @@
 classes:
 - system.docker.client
 - system.docker.host
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.linux.system.repo.docker
 - system.openssh.client.lab
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index e42e891..46485a7 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.rsyslog.client.single
 parameters:
   _jenkins:
diff --git a/classes/cluster/sl-os-contrail/openstack/dashboard.yml b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
index 4b8ad35..b9d1ca2 100755
--- a/classes/cluster/sl-os-contrail/openstack/dashboard.yml
+++ b/classes/cluster/sl-os-contrail/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/sl-os-ovs/openstack/dashboard.yml b/classes/cluster/sl-os-ovs/openstack/dashboard.yml
index 41200f0..33053f4 100644
--- a/classes/cluster/sl-os-ovs/openstack/dashboard.yml
+++ b/classes/cluster/sl-os-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
index 131595d..91813d2 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
index 6aae392..8aa3cd7 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
index b9ad851..4fc475a 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -1,6 +1,6 @@
 classes:
 - system.salt.minion.cert.proxy
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index 0b6277f..a01ea8b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -1,6 +1,6 @@
 classes:
 - system.salt.minion.cert.proxy
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
index 09ae269..a4da2d0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
index 62ded65..13f1269 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
index 8dc953b..35583bf 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
index 414bbe2..1eb1dd0 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
index e3e0881..0a05705 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
index d568fb4..2e24e3b 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
index 5d36c54..1377fec 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
index 5729943..2aac823 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
index c4a4848..ac485c6 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
index 4f1b9d9..34b36f9 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 - system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
index f644754..72236d4 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
index aad38e6..4bb457a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -2,7 +2,7 @@
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single
 parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
index a41617e..950d6ff 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
index 860a411..858712d 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
index 2dafb1d..b4994ec 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index a9cbd60..5e06f50 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial