diff --git a/classes/cluster/k8s-aio-contrail/opencontrail/control.yml b/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
index a3c7b65..d0df38c 100644
--- a/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-aio-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index c584f30..dcf5b4e 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -1,6 +1,5 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index d3e17c7..67259be 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/os-aio-contrail/opencontrail/control.yml b/classes/cluster/os-aio-contrail/opencontrail/control.yml
index 2e2b211..71eded8 100644
--- a/classes/cluster/os-aio-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-aio-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index 93bc439..c8ac4f5 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -1,7 +1,6 @@
 classes:
 - service.docker.host
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
index 325eb9d..a269ba3 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/sl-k8s-contrail/opencontrail/control.yml b/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
index 007dcd2..c8428be 100644
--- a/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-k8s-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/sl-os-contrail/opencontrail/control.yml b/classes/cluster/sl-os-contrail/opencontrail/control.yml
index eba2be8..1bec0b5 100644
--- a/classes/cluster/sl-os-contrail/opencontrail/control.yml
+++ b/classes/cluster/sl-os-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 9683fdf..b5a9e2c 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -5,7 +5,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 53c4f99..fdefe3c 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index 4551ca2..6edba46 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
 - system.linux.system.repo.mcp.contrail
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra