diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
index 674a87a..4276967 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/compute.yml
@@ -1,7 +1,7 @@
 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.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 869f316..1be2cd0 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -1,9 +1,9 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
index 8bd69d9..eac5239 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/dashboard.yml
@@ -1,8 +1,8 @@
 classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- 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
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.horizon.server.single
 - cluster.virtual-mcp-ocata-dvr
 parameters:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
index 9f1fa83..307741e 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/gateway.yml
@@ -1,7 +1,7 @@
 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.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-ocata-dvr
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 564bad5..221dbc6 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     openstack_version: ocata
-    apt_mk_version: nightly
+    apt_mk_version: 2017.12
     mcp_repo_version: 1.1
     openstack_region: RegionOne
     admin_email: root@localhost