diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
index 766c55f..c210cb8 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
@@ -9,7 +9,8 @@
 - system.prometheus.exporters.libvirt
 - system.nova.compute.storage.ceph
 - system.ceph.common.cluster
-- cluster.virtual-mcp-ocata-ovs-ceph
+- cluster.virtual-mcp-ocata-ovs-ceph.ceph.common
+- cluster.virtual-mcp-ocata-ovs-ceph.infra
 parameters:
   _param:
     primary_interface: ens4
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
index 7be99ab..b289988 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -1,6 +1,5 @@
 classes:
 - system.linux.system.lowmem
-- system.linux.system.repo.ceph
 - system.linux.system.repo.glusterfs
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
@@ -37,11 +36,12 @@
 - system.glance.control.storage.ceph
 - system.cinder.control.backend.ceph
 - system.ceph.common.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph.ceph.common
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
 - system.cinder.volume.notification.messagingv2
-- cluster.virtual-mcp-ocata-ovs-ceph
+- cluster.virtual-mcp-ocata-ovs-ceph.infra
 parameters:
   _param:
     keepalived_vip_interface: ens4