diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index 4c09279..e1ca1e7 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -1,7 +1,7 @@
 classes:
 - service.git.client
 - system.linux.system.single
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt
 - system.openssh.client.lab
 - system.salt.master.api
 - system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
index 8f533f7..43d3ab7 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
@@ -1,5 +1,7 @@
 classes:
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
 - system.linux.network.interface.single_ovs_dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
index a4a85a6..e6b54bf 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -1,7 +1,8 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
index d14746a..b38a35a 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -1,4 +1,7 @@
 classes:
+#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
 - system.linux.system.repo.tcp_mk20
 - system.horizon.server.single
 - cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
index ce4ceba..1c4767c 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
@@ -1,6 +1,7 @@
 classes:
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
index 4bd5ae1..ef4ae20 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -1,6 +1,7 @@
 parameters:
   _param:
     openstack_version: mitaka
+    apt_mk_version: nightly
     openstack_region: RegionOne
     admin_email: root@localhost
     cluster_public_host: 172.16.10.254