diff --git a/classes/cluster/os-ha-ovs/openstack/compute.yml b/classes/cluster/os-ha-ovs/openstack/compute.yml
index 0a8a970..113af20 100644
--- a/classes/cluster/os-ha-ovs/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- 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/os-ha-ovs/openstack/control.yml b/classes/cluster/os-ha-ovs/openstack/control.yml
index 4ed5272..acbe53d 100644
--- a/classes/cluster/os-ha-ovs/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs/openstack/control.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.storage.loopback
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
diff --git a/classes/cluster/os-ha-ovs/openstack/dashboard.yml b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
index 9ed2ff7..d6e13a2 100644
--- a/classes/cluster/os-ha-ovs/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.horizon.server.single
 - cluster.os-ha-ovs
 parameters:
diff --git a/classes/cluster/os-ha-ovs/openstack/gateway.yml b/classes/cluster/os-ha-ovs/openstack/gateway.yml
index 4e42807..87f54db 100644
--- a/classes/cluster/os-ha-ovs/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.neutron.gateway.cluster
 - cluster.os-ha-ovs
 parameters: