diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml b/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
index 8c5c79c..2c6da47 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs-ceph/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-ceph/openstack/control.yml b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
index 59bbc6f..e96f218 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/control.yml
@@ -3,7 +3,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.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
index 0a98537..7d0fc6a 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-ceph/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-ceph
 parameters:
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml b/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
index 618a98a..d3ea296 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-ceph/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-ceph
 parameters: