diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
index 2aad679..b11114b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -4,5 +4,21 @@
 parameters:
   ceph:
     common:
-      public_network: 10.1.0.0/24
-      cluster_network: 10.16.0.0/24
+      public_network: 10.60.0.0/24
+      cluster_network: 10.70.0.0/24
+      keyring:
+        glance:
+          name: ${_param:glance_storage_user}
+          caps:
+            mon: "allow r"
+            osd: "allow class-read object_prefix rdb_children, allow rwx pool=images"
+        cinder:
+          name: ${_param:cinder_storage_user}
+          caps:
+            mon: "allow r"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rx pool=images"
+        nova:
+          name: ${_param:nova_storage_user}
+          caps:
+            mon: "allow r"
+            osd: "allow class-read object_prefix rbd_children, allow rwx pool=vms, allow rx pool=images"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
index 7d6fcd0..65908f9 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
@@ -3,3 +3,13 @@
 - system.ceph.mgr.cluster
 - system.linux.system.repo.ceph
 - cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
index 8aab729..3a26d46 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
@@ -3,6 +3,16 @@
 - system.linux.system.repo.ceph
 - cluster.virtual-mcp-ocata-ovs-ceph
 parameters:
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: static
+          address: ${_param:single_address}
+          netmask: 255.255.255.0
+
   ceph:
     osd:
       enabled: true
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 484f11c..7913537 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
@@ -9,53 +9,20 @@
           pg_num: 32
           pgp_num: 32
           type: replicated
+          size: 2
           application: rbd
           crush_rule: sata
         volumes:
           pg_num: 32
           pgp_num: 32
           type: replicated
+          size: 2
           application: rbd
           crush_rule: sata
         vms:
           pg_num: 32
           pgp_num: 32
           type: replicated
+          size: 2
           application: rbd
           crush_rule: sata
-        .rgw.root:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw
-          crush_rule: sata
-        default.rgw.control:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw
-          crush_rule: sata
-        default.rgw.meta:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw
-          crush_rule: sata
-        default.rgw.log:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw
-          crush_rule: sata
-        default.rgw.buckets.index:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw
-          crush_rule: sata
-        default.rgw.buckets.data:
-          pg_num: 32
-          pgp_num: 32
-          type: replicated
-          application: rgw 
-          crush_rule: sata
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 b289988..f57ebca 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -34,9 +34,9 @@
 - system.galera.server.database.nova
 - system.haproxy.proxy.listen.openstack.nova-placement
 - 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.backend.ceph
 - system.cinder.control.cluster
 - system.cinder.control.notification.messagingv2
 - system.cinder.volume.single
@@ -71,8 +71,6 @@
         topics: "notifications,${_param:stacklight_notification_topic}"
   glance:
     server:
-      storage:
-        engine: file
       images: []
       workers: 1
       notification: