diff --git a/tcp_tests/templates/_heat_environments/bm-eu-cloud.env b/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
deleted file mode 100644
index 56a080b..0000000
--- a/tcp_tests/templates/_heat_environments/bm-eu-cloud.env
+++ /dev/null
@@ -1,52 +0,0 @@
-
-resource_registry:
-  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
-  #"MCP::Flavors": fragments/Flavors.yaml
-  "MCP::MasterNode": fragments/MasterNode.yaml
-  "MCP::Compute": fragments/Compute.yaml
-  "MCP::Networks": fragments/Networks.yaml
-  "MCP::SingleInstance": fragments/Instance.yaml
-  "MCP::FoundationNode": fragments/FoundationNode.yaml
-  "MCP::VsrxNode": fragments/VsrxNode.yaml
-  "MCP::Subnets": fragments/Subnets.yaml
-
-parameter_defaults:
-
-  cfg_flavor: system.virtual.salt_master
-  ctl_flavor: system.compact.openstack.control
-  cid_flavor: system.compact.cicd.control
-  ntw_flavor: system.compact.opencontrail.control
-  nal_flavor: system.compact.opencontrail.analytics
-  dbs_flavor: system.compact.openstack.database
-  msg_flavor: system.compact.openstack.message_queue
-  mon_flavor: system.compact.stacklight.server
-  log_flavor: system.compact.stacklight.log
-  mtr_flavor: system.compact.stacklight.telemetry
-  cmp_flavor: system.virtual.openstack.compute
-  cmn_flavor: system.compact.ceph.mon
-  rgw_flavor: system.compact.ceph.rgw
-  osd_flavor: system.virtual.ceph.osd
-  dns_flavor: system.compact.openstack.dns
-  kmn_flavor: system.compact.openstack.barbican
-  prx_flavor: system.compact.openstack.proxy
-  gtw_flavor: system.compact.openstack.gateway
-  kvm_fake_flavor: system.virtual.fake_kvm
-  mdb_flavor: system.compact.openstack.telemetry
-  foundation_flavor: system.virtual.foundation
-  vsrx_flavor: oc_vsrx
-  key_pair: system_key_8133
-  bm_availability_zone: BM
-  vm_availability_zone: nova
-  net_public: public
-
-  foundation_image: system.foundation
-  nameservers: 172.18.208.44
-  control_subnet_cidr: "10.6.0.0/24"
-  tenant_subnet_cidr: "10.8.0.0/24"
-  external_subnet_cidr: "192.168.200.0/24"
-  management_subnet_cidr: "172.16.49.64/26"
-  management_subnet_cfg01_ip: 172.16.49.66
-  management_subnet_gateway_ip: 172.16.49.65
-  management_subnet_pool_start: 172.16.49.68
-  management_subnet_pool_end: 172.16.49.124
-  salt_master_control_ip: 10.6.0.15
diff --git a/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env b/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env
deleted file mode 100644
index 9a801f4..0000000
--- a/tcp_tests/templates/_heat_environments/bm-ovs-cloud.env
+++ /dev/null
@@ -1,48 +0,0 @@
-resource_registry:
-  "MCP::MultipleInstance": fragments/MultipleInstance.yaml
-  #"MCP::Flavors": fragments/Flavors.yaml
-  "MCP::MasterNode": fragments/MasterNode.yaml
-  "MCP::Compute": fragments/Compute.yaml
-  "MCP::Networks": fragments/Networks.yaml
-  "MCP::SingleInstance": fragments/Instance.yaml
-  "MCP::FoundationNode": fragments/FoundationNode.yaml
-  "MCP::Subnets": fragments/Subnets.yaml
-
-parameter_defaults:
-
-  cfg_flavor: system.virtual.salt_master
-  ctl_flavor: system.compact.openstack.control
-  cid_flavor: system.compact.cicd.control
-  ntw_flavor: system.compact.opencontrail.control
-  nal_flavor: system.compact.opencontrail.analytics
-  dbs_flavor: system.compact.openstack.database
-  msg_flavor: system.compact.openstack.message_queue
-  mon_flavor: system.compact.stacklight.server
-  log_flavor: system.compact.stacklight.log
-  mtr_flavor: system.compact.stacklight.telemetry
-  cmp_flavor: system.virtual.openstack.compute
-  cmn_flavor: system.compact.ceph.mon
-  rgw_flavor: system.compact.ceph.rgw
-  osd_flavor: system.virtual.openstack.compute
-  dns_flavor: system.compact.openstack.dns
-  kmn_flavor: system.compact.openstack.barbican
-  prx_flavor: system.compact.openstack.proxy
-  gtw_flavor: system.compact.openstack.gateway
-  kvm_fake_flavor: system.virtual.fake_kvm
-  foundation_flavor: system.virtual.foundation
-  key_pair: system_key_8133
-  bm_availability_zone: BM
-  vm_availability_zone: nova
-  net_public: public
-
-  foundation_image: system.foundation
-  nameservers: 172.18.208.44
-  control_subnet_cidr: "10.167.11.0/24"
-  tenant_subnet_cidr: "10.167.12.0/24"
-  external_subnet_cidr: "172.17.42.0/26"
-  management_subnet_cidr: "172.16.164.0/26"
-  management_subnet_cfg01_ip: 172.16.164.2
-  management_subnet_gateway_ip: 172.16.164.1
-  management_subnet_pool_start: 172.16.164.3
-  management_subnet_pool_end: 172.16.164.62
-  salt_master_control_ip: 10.167.11.5
\ No newline at end of file
diff --git a/tcp_tests/templates/_heat_environments/eu-cloud.env b/tcp_tests/templates/_heat_environments/eu-cloud.env
index 887f538..a22b8c7 100644
--- a/tcp_tests/templates/_heat_environments/eu-cloud.env
+++ b/tcp_tests/templates/_heat_environments/eu-cloud.env
@@ -41,14 +41,4 @@
   net_public: public
 
   foundation_image: system.foundation
-
   nameservers: 172.18.208.44
-  control_subnet_cidr: "10.6.0.0/24"
-  tenant_subnet_cidr: "10.8.0.0/24"
-  external_subnet_cidr: "10.9.0.0/24"
-  management_subnet_cidr: "10.7.0.0/24"
-  management_subnet_cfg01_ip: 10.7.0.15
-  management_subnet_gateway_ip: 10.7.0.1
-  management_subnet_pool_start: 10.7.0.20
-  management_subnet_pool_end: 10.7.0.90
-  salt_master_control_ip: 10.6.0.15
diff --git a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
index 83d91c1..cf68c01 100644
--- a/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/FoundationNode.yaml
@@ -55,7 +55,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: management_net }
-      #network_id: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: management_net_static_ip }
   instance_port02:
@@ -63,7 +62,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: control_net }
-      #network_id: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: control_net_static_ip }
   instance_port03:
@@ -71,7 +69,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: tenant_net }
-      #network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: tenant_net_static_ip }
   instance_port04:
@@ -79,7 +76,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: external_net }
-      #network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: external_net_static_ip }
 
diff --git a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
index 25abaf9..8290611 100644
--- a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
@@ -45,7 +45,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: management_net }
-      #network_id: { list_join: ['-', [ 'management_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: management_subnet_cfg01_ip }
 
@@ -54,7 +53,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: control_net }
-      #network_id: { list_join: ['-', [ 'control_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: salt_master_control_ip }
 
@@ -63,7 +61,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: tenant_net }
-      #network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: tenant_net_static_ip }
 
@@ -72,7 +69,6 @@
     properties:
       port_security_enabled: false
       network_id: { get_param: external_net }
-      #network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
       fixed_ips:
         - ip_address: { get_param: external_net_static_ip }
 
diff --git a/tcp_tests/templates/_heat_environments/fragments/Networks.yaml b/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
index 46bb048..5840d80 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Networks.yaml
@@ -6,39 +6,8 @@
 parameters:
   env_name:
     type: string
-  net_public:
-    type: string
   stack_name:
     type: string
-  control_subnet_cidr:
-    type: string
-  tenant_subnet_cidr:
-    type: string
-  management_subnet_cidr:
-    type: string
-  external_subnet_cidr:
-    type: string
-  management_subnet_gateway_ip:
-    type: string
-#  control_net_dhcp:
-#    type: boolean
-#    default: false
-#  tenant_net_dhcp:
-#    type: boolean
-#    default: false
-  management_net_dhcp:
-    type: boolean
-    default: true
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
-#  external_net_dhcp:
-#    type: boolean
-#    default: false
-
-  nameservers:
-    type: comma_delimited_list
 
 resources:
   control_net:
diff --git a/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml b/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
index 330d379..61333dd 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Subnets.yaml
@@ -54,11 +54,9 @@
     type: OS::Neutron::Subnet
     properties:
       name: { list_join: ['-', [ { get_param: control_net }, 'subnet', { get_param: env_name } ]] }
-      #name: control_subnet
       network: { get_param: control_net }
       cidr: { get_param: control_subnet_cidr }
       #enable_dhcp: { get_param: control_net_dhcp }
-      #dns_nameservers: { get_param: nameservers }
       dns_nameservers: [0.0.0.0]
       gateway_ip: null
       tags:
@@ -68,11 +66,9 @@
     type: OS::Neutron::Subnet
     properties:
       name: { list_join: ['-', [ { get_param: tenant_net }, 'subnet', { get_param: env_name } ]] }
-      #name: tenant_subnet
       network: { get_param: tenant_net }
       cidr: { get_param: tenant_subnet_cidr }
       #enable_dhcp: { get_param: tenant_net_dhcp }
-      #dns_nameservers: { get_param: nameservers }
       dns_nameservers: [0.0.0.0]
       gateway_ip: null
       tags:
@@ -83,7 +79,6 @@
     properties:
       gateway_ip: { get_param: management_subnet_gateway_ip }
       name: { list_join: ['-', [ { get_param: management_net }, 'subnet', { get_param: env_name } ]] }
-      #name: management_subnet
       network: { get_param: management_net }
       cidr: { get_param: management_subnet_cidr }
       enable_dhcp: { get_param: management_net_dhcp }
@@ -98,11 +93,9 @@
     type: OS::Neutron::Subnet
     properties:
       name: { list_join: ['-', [ { get_param: external_net }, 'subnet', { get_param: env_name } ]] }
-      #name: external_subnet
       network: { get_param: external_net }
       cidr: { get_param: external_subnet_cidr }
       #enable_dhcp: { get_param: external_net_dhcp }
-      #dns_nameservers: { get_param: nameservers }
       dns_nameservers: [0.0.0.0]
       gateway_ip: null
       tags:
diff --git a/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
index e965058..6ddc6a7 100644
--- a/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/VsrxNode.yaml
@@ -31,8 +31,6 @@
     type: string
   external_net_static_ip:
     type: string
-  # underlay_userdata:
-  #   type: string
   env_name:
     type: string
   mcp_version:
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
index e711b81..b7e703f 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
@@ -20,9 +20,35 @@
     type: string
   foundation_flavor:
     type: string
-
   bm_availability_zone:
     type: string
+  control_subnet_cidr:
+    type: string
+    default: "10.167.11.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.167.12.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "172.17.42.0/26"
+  management_subnet_cidr:
+    type: string
+    default: "172.16.164.0/26"
+  management_subnet_cfg01_ip:
+    type: string
+    default: 172.16.164.2
+  management_subnet_gateway_ip:
+    type: string
+    default: 172.16.164.1
+  management_subnet_pool_start:
+    type: string
+    default: 172.16.164.3
+  management_subnet_pool_end:
+    type: string
+    default: 172.16.164.61
+  salt_master_control_ip:
+    type: string
+    default: 10.167.11.15
 
 resources:
   subnets:
@@ -34,6 +60,13 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -50,6 +83,8 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -74,6 +109,7 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
index 8365a2f..19b5fac 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -20,9 +20,35 @@
     type: string
   foundation_flavor:
     type: string
-
   bm_availability_zone:
     type: string
+  control_subnet_cidr:
+    type: string
+    default: "10.167.11.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.167.12.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "172.17.42.0/26"
+  management_subnet_cidr:
+    type: string
+    default: "172.16.164.0/26"
+  management_subnet_cfg01_ip:
+    type: string
+    default: 172.16.164.2
+  management_subnet_gateway_ip:
+    type: string
+    default: 172.16.164.1
+  management_subnet_pool_start:
+    type: string
+    default: 172.16.164.3
+  management_subnet_pool_end:
+    type: string
+    default: 172.16.164.61
+  salt_master_control_ip:
+    type: string
+    default: 10.167.11.15
 
 resources:
   subnets:
@@ -34,6 +60,13 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -50,6 +83,8 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -74,6 +109,7 @@
       control_net: 'system-phys-2404'
       tenant_net: 'system-phys-2406'
       external_net: 'system-phys-2403'
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
index d8c2e9f..45b5b2a 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
@@ -24,6 +24,33 @@
     type: string
   bm_availability_zone:
     type: string
+  control_subnet_cidr:
+    type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
+  management_subnet_cidr:
+    type: string
+    default: "172.16.49.64/26"
+  management_subnet_cfg01_ip:
+    type: string
+    default: 172.16.49.66
+  management_subnet_gateway_ip:
+    type: string
+    default: 172.16.49.65
+  management_subnet_pool_start:
+    type: string
+    default: 172.16.49.68
+  management_subnet_pool_end:
+    type: string
+    default: 172.16.49.124
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
 resources:
   subnets:
@@ -35,6 +62,13 @@
       control_net: 'system-phys-2422'
       tenant_net: 'system-phys-2423'
       external_net: 'system-phys-2424'
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -51,6 +85,8 @@
       control_net: 'system-phys-2422'
       tenant_net: 'system-phys-2423'
       external_net: 'system-phys-2424'
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -75,6 +111,7 @@
       control_net: 'system-phys-2422'
       tenant_net: 'system-phys-2423'
       external_net: 'system-phys-2424'
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       instance_image: { get_param: foundation_image }
       instance_flavor: {get_param: foundation_flavor}
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
diff --git a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
index 6f4bb14..b283274 100644
--- a/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-calico-sl/underlay.hot
@@ -14,17 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
-
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
   key_pair:
     type: string
 
@@ -74,6 +88,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -90,6 +111,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -585,6 +608,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join:
diff --git a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
index fa01312..a3899e7 100644
--- a/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-contrail41-sl/underlay.hot
@@ -14,16 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
   key_pair:
     type: string
@@ -80,6 +95,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -96,6 +118,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -694,6 +718,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join:
diff --git a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot b/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
index f05b7c6..49ea8be 100644
--- a/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-k8s-genie/underlay.hot
@@ -14,16 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
   key_pair:
     type: string
@@ -75,6 +90,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -91,6 +113,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -430,6 +454,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join:
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 9aa42b1..8a700ec 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -14,16 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
   key_pair:
     type: string
@@ -91,6 +106,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -107,6 +129,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -910,6 +934,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join:
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
index a5882c3..16cc21b 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -14,16 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
   key_pair:
     type: string
@@ -94,6 +109,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -110,6 +132,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -656,6 +680,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join:
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
index 210390f..f40e867 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -14,16 +14,31 @@
     type: string
   control_subnet_cidr:
     type: string
+    default: "10.6.0.0/24"
+  tenant_subnet_cidr:
+    type: string
+    default: "10.8.0.0/24"
+  external_subnet_cidr:
+    type: string
+    default: "192.168.200.0/24"
   management_subnet_cidr:
     type: string
-  management_subnet_pool_start:
-    type: string
-  management_subnet_pool_end:
-    type: string
+    default: "10.7.0.0/24"
   management_subnet_cfg01_ip:
     type: string
+    default: 10.7.0.15
   management_subnet_gateway_ip:
     type: string
+    default: 10.7.0.1
+  management_subnet_pool_start:
+    type: string
+    default: 10.7.0.20
+  management_subnet_pool_end:
+    type: string
+    default: 10.7.0.90
+  salt_master_control_ip:
+    type: string
+    default: 10.6.0.15
 
   key_pair:
     type: string
@@ -94,6 +109,13 @@
       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 } ]] }
+      control_subnet_cidr: { get_param: control_subnet_cidr }
+      tenant_subnet_cidr: { get_param: tenant_subnet_cidr }
+      external_subnet_cidr: { get_param: external_subnet_cidr }
+      management_subnet_cidr: { get_param: management_subnet_cidr }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
+      management_subnet_pool_start: { get_param: management_subnet_pool_start }
+      management_subnet_pool_end: { get_param: management_subnet_pool_end }
 
   #flavors:
   #  type: MCP::Flavors
@@ -110,6 +132,8 @@
       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 } ]] }
+      salt_master_control_ip: { get_param: salt_master_control_ip }
+      management_subnet_cfg01_ip: { get_param: management_subnet_cfg01_ip }
       tenant_net_static_ip:
         list_join:
         - '.'
@@ -656,6 +680,7 @@
       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 } ]] }
+      management_subnet_gateway_ip: { get_param: management_subnet_gateway_ip }
       underlay_userdata: { get_file: ./underlay--user-data-foundation.yaml }
       management_net_static_ip:
         list_join: