diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
index d33991d..484f11c 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
@@ -6,56 +6,56 @@
     setup:
       pool:
         images:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         volumes:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         vms:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rbd
           crush_rule: sata
         .rgw.root:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.control:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.meta:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.log:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.buckets.index:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw
           crush_rule: sata
         default.rgw.buckets.data:
-          pg_num: 30
-          pgp_num: 30
+          pg_num: 32
+          pgp_num: 32
           type: replicated
           application: rgw 
           crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
index ee079b6..c1afc30 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -25,7 +25,6 @@
 - system.reclass.storage.system.openstack_gateway_single
 - system.reclass.storage.system.openstack_dashboard_single
 - system.reclass.storage.system.stacklightv2_server_cluster
-#- system.reclass.storage.system.ceph_mon_cluster
 - cluster.virtual-mcp-ocata-ovs-ceph.openstack.proxy
 - cluster.virtual-mcp-ocata-ovs-ceph.stacklight.proxy
 - cluster.virtual-mcp-ocata-ovs-ceph
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