diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
index cf2722e..02133af 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
index 8f4a5ff..fc50e87 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
index 177b577..24547a9 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
@@ -1,6 +1,6 @@
 classes:
 - system.horizon.server.single
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
index 2794889..6632378 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.interface.single_ovs_dvr
 - system.neutron.gateway.cluster
 - cluster.virtual-mcp-mitaka-dvr-trusty