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 81438e8..17bbef5 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
@@ -35,19 +35,19 @@
     default: "10.9.0.0/24"
   management_subnet_cidr:
     type: string
-    default: "172.16.49.64/26"
+    default: "172.16.164.0/26"
   management_subnet_cfg01_ip:
     type: string
-    default: 172.16.49.66
+    default: 172.16.164.2
   management_subnet_gateway_ip:
     type: string
-    default: 172.16.49.65
+    default: 172.16.164.1
   management_subnet_pool_start:
     type: string
-    default: 172.16.49.68
+    default: 172.16.164.3
   management_subnet_pool_end:
     type: string
-    default: 172.16.49.124
+    default: 172.16.164.61
   salt_master_control_ip:
     type: string
     default: 10.6.0.15
@@ -58,10 +58,10 @@
     properties:
       stack_name: { get_param: "OS::stack_name" }
       env_name: { get_param: env_name }
-      management_net: 'system-phys-2421'
-      control_net: 'system-phys-2422'
-      tenant_net: 'system-phys-2423'
-      external_net: 'system-phys-2424'
+      management_net: 'system-phys-2401'
+      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 }
@@ -81,10 +81,10 @@
       mcp_version: { get_param: mcp_version }
       cfg01_flavor: { get_param: cfg_flavor }
       availability_zone: { get_param: bm_availability_zone }
-      management_net: 'system-phys-2421'
-      control_net: 'system-phys-2422'
-      tenant_net: 'system-phys-2423'
-      external_net: 'system-phys-2424'
+      management_net: 'system-phys-2401'
+      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:
@@ -107,10 +107,10 @@
       instance_domain: {get_param: instance_domain}
       instance_name: foundation
       availability_zone: { get_param: bm_availability_zone }
-      management_net: 'system-phys-2421'
-      control_net: 'system-phys-2422'
-      tenant_net: 'system-phys-2423'
-      external_net: 'system-phys-2424'
+      management_net: 'system-phys-2401'
+      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}
@@ -118,7 +118,7 @@
       management_net_static_ip:
         list_join:
         - '.'
-        - [ { get_attr: [subnets, management_net_prefix] }, '125' ]
+        - [ { get_attr: [subnets, management_net_prefix] }, '62' ]
       control_net_static_ip:
         list_join:
         - '.'
@@ -143,10 +143,10 @@
       instance_name: vsrx
       instance_flavor: {get_param: vsrx_flavor}
       availability_zone: { get_param: bm_availability_zone }
-      management_net: 'system-phys-2421'
-      control_net: 'system-phys-2422'
-      tenant_net: 'system-phys-2423'
-      external_net: 'system-phys-2424'
+      management_net: 'system-phys-2401'
+      control_net: 'system-phys-2404'
+      tenant_net: 'system-phys-2406'
+      external_net: 'system-phys-2403'
       instance_image: system_vsrx-12.1X46-D20.5
       control_net_static_ip:
         list_join: