diff --git a/conf/flavor/chef_ceph_openstack.conf b/conf/flavor/chef_ceph_openstack.conf
index 9254a784..074f119a 100644
--- a/conf/flavor/chef_ceph_openstack.conf
+++ b/conf/flavor/chef_ceph_openstack.conf
@@ -10,6 +10,6 @@ FLAVORS = [
         'os-network-worker', 'os-network-server', 'os-block-storage-controller',
         'os-block-storage-volume', 'os-ceph-image', 'os-dashboard',
         'ceph-os-block-config', 'ceph-os-compute-config', 'ceph-os-object-config',
-        'ceph-os-image-config', 'openstack_config_mon', 'openstack_config_radosgw'
+        'openstack_config_mon', 'openstack_config_radosgw'
     ]
 }]
diff --git a/conf/package_metadata/ceph_openstack.conf b/conf/package_metadata/ceph_openstack.conf
index ed8de2a0..1036e297 100644
--- a/conf/package_metadata/ceph_openstack.conf
+++ b/conf/package_metadata/ceph_openstack.conf
@@ -62,5 +62,33 @@ METADATA = {
                 }
             }
         }
+    },
+    'network_mapping': {
+        '_self': {
+            'required_in_whole_config': True,
+            'key_extensions': {
+                '$interface_type': ['public_network', 'cluster_network']
+            }
+        },
+        '$interface_type': {
+            '_self': {
+                'required_in_whole_config': True,
+                'field': 'anytype',
+                'autofill_callback': autofill_network_mapping,
+                'mapping_to': '$interface_type'
+            },
+            'interface': {
+                '_self': {
+                    'is_required': True,
+                    'field': 'general',
+                }
+            },
+            'subnet': {
+                '_self': {
+                    'is_required': False,
+                    'field': 'general'
+                }
+            }
+        }
     }
 }
diff --git a/conf/role/chef_ceph_openstack.conf b/conf/role/chef_ceph_openstack.conf
index d8fc8089..1a771bdc 100644
--- a/conf/role/chef_ceph_openstack.conf
+++ b/conf/role/chef_ceph_openstack.conf
@@ -71,10 +71,6 @@ ROLES = [{
     'role': 'ceph-os-compute-config',
     'display_name': 'ceph-os compute config',
     'description': 'ceph os compute config'
-}, {
-    'role': 'ceph-os-image-config',
-    'display_name': 'ceph-os image config',
-    'description': 'ceph os image config'
 }, {
     'role': 'ceph-os-object-config',
     'display_name': 'ceph-os object config',
diff --git a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
index 071d090e..8f239cf7 100644
--- a/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
+++ b/conf/templates/chef_installer/ceph_openstack_icehouse/environments/multinodes.tmpl
@@ -6,8 +6,9 @@
 #set fsid = str(uuid.uuid4())
 #set rbd_secret_uuid = str(uuid.uuid4())
 
-#set public_network_subnet = $network_mapping.public_network.subnet
-#set cluster_network_subnet = $network_mapping.cluster_network.subnet
+#set ceph_osd_role = $getVar('ceph_osd', None)
+#set public_network_subnet = $ceph_osd_role.public_network.subnet
+#set cluster_network_subnet = $ceph_osd_role.cluster_network.subnet
 
 #set osd_pool_pg_num = $getVar('osd_pool_pg_num', '1024')
 #set osd_pool_pgp_num = $getVar('osd_pool_pgp_num', '1024')
@@ -17,7 +18,7 @@
 #set osd_op_threads = $getVar('op_threads', 10)
 
 #set devices = []
-#if not $getVar('osd_devices', {})
+#if $getVar('osd_devices', None) != None
     #set devices_info = $osd_devices
     #set devices_num = len($devices_info)
     #set devices = [x for x in range($devices_num)]