diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 6563a6b..ec64f71 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/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-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
index 2262899..8c50b04 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -1,7 +1,8 @@
 classes:
-- system.linux.system.repo.mcp_contrail
-#- system.linux.system.repo.mos9
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
 - system.heka.alarm.openstack_compute
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 18d5f69..4dc30b3 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -1,8 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.mcp_contrail
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.contrail
+- 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-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
index 2c4a32e..0c6e349 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -1,5 +1,8 @@
 classes:
 - system.linux.system.repo.tcp_mk20
+#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
 - system.horizon.server.single
 - cluster.virtual-mcp10-contrail
 parameters:
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
index ed8513a..81ac134 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/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: _