diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index 9e41e85..d000096 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.network.hosts
@@ -15,7 +15,6 @@
     tenant_interface: ens5
     external_interface: ens6
     interface_mtu: 1500
-    linux_system_codename: xenial
   neutron:
     compute:
       notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index 1fac8c1..20c3b3d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
 - system.linux.system.lowmem
 - system.linux.storage.loopback
 - system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
index 743aa63..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
@@ -1,10 +1,6 @@
 classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
 - system.horizon.server.single
-- cluster.virtual-mcp-mitaka-dvr
+- system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index d7d93e8..0717926 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.network.interface.single_ovs_dvr
@@ -13,7 +13,6 @@
     interface_mtu: 9000
     neutron_gateway_dvr: True
     neutron_gateway_agent_mode: dvr_snat
-    linux_system_codename: xenial
   neutron:
     gateway:
       notification: