diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
index 19ec724..b2563f6 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.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.system.repo.mcp.contrail
 
 - system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml b/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
index 110d389..899afb7 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
@@ -2,7 +2,7 @@
 - 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.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.network.hosts
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
index 47f3f44..8a4ac5f 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
@@ -4,7 +4,7 @@
 - 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.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-contrail-ironic/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
index 3a410db..e68e15e 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-ironic/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.cluster
 - system.horizon.server.plugin.contrail
 - system.horizon.server.plugin.overrides