diff --git a/de/heat-templates/env/compute.yaml b/de/heat-templates/env/compute.yaml
index d86cae9..27d746c 100644
--- a/de/heat-templates/env/compute.yaml
+++ b/de/heat-templates/env/compute.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/converged.yaml b/de/heat-templates/env/converged.yaml
index 2a717dd..22dcc3e 100644
--- a/de/heat-templates/env/converged.yaml
+++ b/de/heat-templates/env/converged.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
index 5e0cee6..6ed7eef 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
index f8c5b41..eea6f9a 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
index 39a878b..ec642a5 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
index 01f4dcb..b156406 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
index b05a078..af06f3e 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-lma3.yaml
@@ -29,7 +29,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
index 787cc14..80229a2 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3.yaml
@@ -27,7 +27,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
index 4d83a5d..5cd5461 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
index be632cb..ff191f8 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp3-ntw3.yaml
@@ -27,7 +27,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
index bab863b..505f03b 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp0-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
index 394b48a..475c6ba 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml b/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
index 8fb160f..320249e 100644
--- a/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
+++ b/de/heat-templates/env/mstr1-wrkr5-cmp3-gtw0.yaml
@@ -24,7 +24,7 @@
   gtw_metadata: {"labels": {"openvswitch":"enabled"}}
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
index 1ca19a9..4ab970f 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
index fcf50c8..fa6bbd1 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp0-gtw0.yaml
@@ -23,7 +23,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
index a6eb31d..487ed47 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0-lma3.yaml
@@ -28,7 +28,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
index c61bde7..8e49e50 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw0.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
index f85da29..194b9bf 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw2.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
index 4ba3500..4007c36 100644
--- a/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
+++ b/de/heat-templates/env/mstr3-wrkr3-cmp2-gtw3-lma3.yaml
@@ -27,7 +27,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/env/telco.yaml b/de/heat-templates/env/telco.yaml
index a759bff..f333e22 100644
--- a/de/heat-templates/env/telco.yaml
+++ b/de/heat-templates/env/telco.yaml
@@ -26,7 +26,7 @@
   # ephemeral storage because it is used for Ceph bluestore.
   workers_flavor: 'system.compact.openstack.control.ephemeral'
   cmps_flavor: 'system.compact.openstack.control.ephemeral'
-  storage_frontend_network_cidr: '10.12.0.0/24'
+  storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
   hardware_metadata: |
     '00:00:00:00:00:00':
diff --git a/de/heat-templates/fragments/NetworkAccVMStorage.yaml b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
index f1475b3..154976f 100644
--- a/de/heat-templates/fragments/NetworkAccVMStorage.yaml
+++ b/de/heat-templates/fragments/NetworkAccVMStorage.yaml
@@ -14,7 +14,7 @@
     type: OS::Neutron::Subnet
     properties:
       network: { get_resource: storage_backend_network }
-      enable_dhcp: false
+      enable_dhcp: true
       cidr: { get_param: storage_backend_network_cidr }
       gateway_ip: ~
 
@@ -24,7 +24,7 @@
     type: OS::Neutron::Subnet
     properties:
       network: { get_resource: storage_frontend_network }
-      enable_dhcp: false
+      enable_dhcp: true
       cidr: { get_param: storage_frontend_network_cidr }
       gateway_ip: ~
 
diff --git a/de/heat-templates/top.yaml b/de/heat-templates/top.yaml
index 0ce2437..d7d165f 100644
--- a/de/heat-templates/top.yaml
+++ b/de/heat-templates/top.yaml
@@ -250,7 +250,7 @@
     properties:
       count: { get_param: worker_size }
       resource_def:
-        type: MCP2::SrvInstancesCeph
+        type: MCP2::SrvInstancesCephOSD
         properties:
           metadata: { get_param: worker_metadata}
           node_type: "worker"
@@ -274,6 +274,10 @@
           storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
           storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+          storage_backend_interface: { get_param: storage_backend_interface }
+          storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
+          storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id] }
+          storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   cmps:
@@ -283,7 +287,7 @@
     properties:
       count: { get_param: cmp_size }
       resource_def:
-        type: MCP2::SrvInstancesCeph
+        type: MCP2::SrvInstancesCephOSD
         properties:
           metadata: { get_param: cmp_metadata }
           node_type: "worker"
@@ -306,6 +310,10 @@
           storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
           storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
           storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
+          storage_backend_interface: { get_param: storage_backend_interface }
+          storage_backend_network: { get_attr: [storage_network, storage_backend_network_id] }
+          storage_backend_subnet_id: { get_attr: [storage_network, storage_backend_subnet_id] }
+          storage_backend_network_cidr: { get_param: storage_backend_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   gtws:
@@ -315,7 +323,7 @@
     properties:
       count: { get_param: gtw_size }
       resource_def:
-        type: MCP2::SrvInstances
+        type: MCP2::SrvInstancesCeph
         properties:
           metadata: { get_param: gtw_metadata }
           node_type: "worker"
@@ -334,6 +342,10 @@
           control_network_cidr: { get_param: control_network_cidr }
           ucp_master_host: { get_attr: [ucp, server_private_ip] }
           functions_override: { get_param: functions_override }
+          storage_frontend_interface: { get_param: storage_frontend_interface }
+          storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
+          storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
+          storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
   lmas:
@@ -447,7 +459,7 @@
     properties:
       count: { get_param: ntw_size }
       resource_def:
-        type: MCP2::SrvInstances
+        type: MCP2::SrvInstancesCeph
         properties:
           metadata: { get_param: ntw_metadata }
           node_type: "worker"
@@ -466,6 +478,10 @@
           control_network_cidr: { get_param: control_network_cidr }
           ucp_master_host: { get_attr: [ucp, server_private_ip] }
           functions_override: { get_param: functions_override }
+          storage_frontend_interface: { get_param: storage_frontend_interface }
+          storage_frontend_network: { get_attr: [storage_network, storage_frontend_network_id] }
+          storage_frontend_subnet_id: { get_attr: [storage_network, storage_frontend_subnet_id] }
+          storage_frontend_network_cidr: { get_param: storage_frontend_network_cidr }
           hardware_metadata: { get_param: hardware_metadata}
 
 outputs: