diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
index 4b82924..bca1c84 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -74,6 +74,16 @@
     properties:
       stack_name: { get_param: "OS::stack_name" }
       env_name: { get_param: env_name }
+  subnets:
+    depends_on: [networks]
+    type: MCP::Subnets
+    properties:
+      stack_name: { get_param: "OS::stack_name" }
+      env_name: { get_param: env_name }
+      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
+      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
+      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
 
   #flavors:
   #  type: MCP::Flavors
@@ -85,17 +95,20 @@
       env_name: { get_param: env_name }
       mcp_version: { get_param: mcp_version }
       cfg01_flavor: { get_param: cfg_flavor }
+      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
+      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
+      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '15' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '15' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '15' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '15' ]
       instance_name: cfg01
       instance_domain: {get_param: instance_domain}
-      network: { get_attr: [networks, network] }
 
   control_cluster:
     type: MCP::MultipleInstance
@@ -108,44 +121,43 @@
       instance02_name: ctl02
       instance03_name: ctl03
       instance_flavor: {get_param: ctl_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '11' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '11' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '12' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '12' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '13' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '13' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '11' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '11' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '12' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '12' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '13' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '13' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '11' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '11' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '12' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '12' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '13' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '13' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -160,44 +172,43 @@
       instance02_name: dbs02
       instance03_name: dbs03
       instance_flavor: {get_param: dbs_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '51' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '51' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '52' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '52' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '53' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '53' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '51' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '51' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '52' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '52' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '53' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '53' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '51' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '51' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '52' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '52' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '53' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '53' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -212,44 +223,43 @@
       instance02_name: kvm02
       instance03_name: kvm03
       instance_flavor: {get_param: kvm_fake_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '241' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '241' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '242' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '242' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '243' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '243' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '241' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '241' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '242' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '242' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '243' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '243' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '241' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '241' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '242' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '242' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '243' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '243' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -264,44 +274,43 @@
       instance02_name: msg02
       instance03_name: msg03
       instance_flavor: {get_param: msg_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '41' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '41' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '42' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '42' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '43' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '43' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '41' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '41' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '42' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '42' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '43' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '43' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '41' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '41' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '42' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '42' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '43' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '43' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -316,44 +325,43 @@
       instance02_name: cid02
       instance03_name: cid03
       instance_flavor: {get_param: cid_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '91' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '91' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '92' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '92' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '93' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '93' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '91' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '91' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '92' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '92' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '93' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '93' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '91' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '91' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '92' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '92' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '93' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '93' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -368,44 +376,43 @@
       instance02_name: ntw02
       instance03_name: ntw03
       instance_flavor: {get_param: ntw_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '21' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '21' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '22' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '22' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '23' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '23' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '21' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '21' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '22' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '22' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '23' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '23' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '21' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '21' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '22' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '22' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '23' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '23' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -420,44 +427,43 @@
       instance02_name: nal02
       instance03_name: nal03
       instance_flavor: {get_param: nal_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '31' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '31' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '32' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '32' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '33' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '33' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '31' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '31' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '32' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '32' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '33' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '33' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '31' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '31' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '32' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '32' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '33' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '33' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -472,44 +478,43 @@
       instance02_name: mon02
       instance03_name: mon03
       instance_flavor: {get_param: mon_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '71' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '71' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '72' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '72' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '73' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '73' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '71' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '71' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '72' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '72' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '73' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '73' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '71' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '71' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '72' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '72' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '73' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '73' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -524,44 +529,43 @@
       instance02_name: log02
       instance03_name: log03
       instance_flavor: {get_param: log_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '61' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '61' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '62' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '62' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '63' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '63' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '61' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '61' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '62' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '62' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '63' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '63' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '61' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '61' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '62' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '62' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '63' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '63' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -576,44 +580,43 @@
       instance02_name: mtr02
       instance03_name: mtr03
       instance_flavor: {get_param: mtr_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '86' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '86' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '87' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '87' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '88' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '88' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '86' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '86' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '87' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '87' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '88' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '88' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '86' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '86' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '87' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '87' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '88' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '88' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -628,44 +631,43 @@
       instance02_name: cmn02
       instance03_name: cmn03
       instance_flavor: {get_param: cmn_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '66' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '66' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '67' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '67' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '68' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '68' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '66' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '66' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '67' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '67' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '68' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '68' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '66' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '66' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '67' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '67' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '68' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '68' ]
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
   ceph_rgw_cluster:
@@ -679,44 +681,43 @@
       instance02_name: rgw02
       instance03_name: rgw03
       instance_flavor: {get_param: rgw_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '76' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '76' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '77' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '77' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '78' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '78' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '76' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '76' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '77' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '77' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '78' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '78' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '76' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '76' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '77' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '77' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '78' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '78' ]
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
   ceph_osd_cluster:
@@ -730,44 +731,43 @@
       instance02_name: osd002
       instance03_name: osd003
       instance_flavor: {get_param: osd_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       instance01_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '201' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '201' ]
       instance02_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '202' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '202' ]
       instance03_control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '203' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '203' ]
       instance01_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '201' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '201' ]
       instance02_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '202' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '202' ]
       instance03_tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '203' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '203' ]
       instance01_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '201' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '201' ]
       instance02_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '202' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '202' ]
       instance03_external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '203' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '203' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -780,20 +780,19 @@
       instance_domain: {get_param: instance_domain}
       instance_name: prx01
       instance_flavor: {get_param: cid_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '81' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '81' ]
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '81' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '81' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '81' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '81' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -806,20 +805,19 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp001
       instance_flavor: {get_param: cmp_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '101' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '101' ]
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '101' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '101' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '101' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '101' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -832,20 +830,19 @@
       instance_domain: {get_param: instance_domain}
       instance_name: cmp002
       instance_flavor: {get_param: cmp_flavor}
-      network: { get_attr: [networks, network] }
       underlay_userdata: { get_file: ./underlay-userdata.yaml }
       control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '102' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '102' ]
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '102' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '102' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '102' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '102' ]
 
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
@@ -859,20 +856,27 @@
       instance_name: foundation
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
-      network: { get_attr: [networks, network] }
+      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
+      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
+      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
+      management_net_static_ip:
+        list_join:
+        - '.'
+        - [ { get_attr: [subnets, management_net_prefix] }, '5' ]
       control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '5' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '5' ]
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '5' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '5' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '5' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '5' ]
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
   vsrx_node:
@@ -884,33 +888,27 @@
       instance_domain: {get_param: instance_domain}
       instance_name: vsrx
       instance_flavor: {get_param: vsrx_flavor}
+      management_net: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
+      control_net: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
+      tenant_net: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+      external_net: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
       instance_image: system_vsrx-12.1X46-D20.5
-      network: { get_attr: [networks, network] }
       control_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, control_net_prefix] }, '220' ]
+        - [ { get_attr: [subnets, control_net_prefix] }, '220' ]
       tenant_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, tenant_net_prefix] }, '220' ]
+        - [ { get_attr: [subnets, tenant_net_prefix] }, '220' ]
       external_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [networks, external_net_prefix] }, '220' ]
+        - [ { get_attr: [subnets, external_net_prefix] }, '220' ]
       instance_config_host: { get_attr: [cfg01_node, instance_address] }
 
 outputs:
-
-  control_subnet_cidr:
-    description: Control network CIDR
-    value: { get_param: control_subnet_cidr }
-
-  management_subnet_cidr:
-    description: Admin network CIDR
-    value: { get_param: management_subnet_cidr }
-
-  foundation_floating:
+  foundation_public_ip:
     description: foundation node IP address (floating) from external network
     value:
       get_attr: