diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 136e4c1..0c5bbac 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -225,7 +225,7 @@
   openstack_ovs_encapsulation_type: vxlan
   #openstack_proxy_address: 172.17.16.80  # external network endpoint
   openstack_proxy_address: 10.167.4.80  # external network endpoint
-  openstack_proxy_vip_interface: ens5
+  openstack_proxy_vip_interface: ens6
   openstack_proxy_hostname: prx
   openstack_proxy_node01_address: 10.167.4.81
   openstack_proxy_node01_hostname: prx01
@@ -301,9 +301,9 @@
   openstack_internal_protocol: 'https'
   openstack_create_public_network: 'True'
   openstack_public_neutron_subnet_gateway: 10.9.0.1
-  openstack_public_neutron_subnet_cidr: 10.9.0.0/24
-  openstack_public_neutron_subnet_allocation_start: 10.9.0.201
-  openstack_public_neutron_subnet_allocation_end: 10.9.0.245
+  openstack_public_neutron_subnet_cidr: 10.9.0.0/16
+  openstack_public_neutron_subnet_allocation_start: 10.9.128.5
+  openstack_public_neutron_subnet_allocation_end: 10.9.128.253
 
   #openstack_public_neutron_subnet_gateway: 172.17.16.1
   #openstack_public_neutron_subnet_cidr: 172.17.16.0/24
@@ -376,4 +376,4 @@
     minimum_password_age: 0
     password_regex: "'^[a-zA-Z0-9~!@#%^&\\*_=+]{32,}$$'"
     password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
-    change_password_upon_first_use: False
\ No newline at end of file
+    change_password_upon_first_use: False
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
index fcb707f..193051c 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
@@ -13,7 +13,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.15
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     cid01:
       reclass_storage_name: cicd_control_node01
@@ -159,7 +159,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.121
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     prx02:
       reclass_storage_name: openstack_proxy_node02
@@ -173,7 +173,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.122
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     mon01:
       reclass_storage_name: stacklight_server_node01
@@ -318,9 +318,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw01:
       reclass_storage_name: openstack_gateway_node01
@@ -333,9 +333,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw02:
       reclass_storage_name: openstack_gateway_node02
@@ -348,9 +348,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw03:
       reclass_storage_name: openstack_gateway_node03
@@ -363,9 +363,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     osd<<count>>:
       reclass_storage_name: ceph_osd_rack01
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 16cc21b..5ee777b 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay.hot
@@ -20,7 +20,7 @@
     default: "10.8.0.0/24"
   external_subnet_cidr:
     type: string
-    default: "192.168.200.0/24"
+    default: "10.9.0.0/16"
   management_subnet_cidr:
     type: string
     default: "10.7.0.0/24"
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 45efa02..2d901b3 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -225,7 +225,7 @@
   openstack_ovs_encapsulation_type: vxlan
   #openstack_proxy_address: 172.17.16.80  # external network endpoint
   openstack_proxy_address: 10.167.4.80  # external network endpoint
-  openstack_proxy_vip_interface: ens5
+  openstack_proxy_vip_interface: ens6
   openstack_proxy_hostname: prx
   openstack_proxy_node01_address: 10.167.4.81
   openstack_proxy_node01_hostname: prx01
@@ -302,9 +302,9 @@
   openstack_create_public_network: 'True'
 
   openstack_public_neutron_subnet_gateway: 10.9.0.1
-  openstack_public_neutron_subnet_cidr: 10.9.0.0/24
-  openstack_public_neutron_subnet_allocation_start: 10.9.0.201
-  openstack_public_neutron_subnet_allocation_end: 10.9.0.245
+  openstack_public_neutron_subnet_cidr: 10.9.0.0/16
+  openstack_public_neutron_subnet_allocation_start: 10.9.128.5
+  openstack_public_neutron_subnet_allocation_end: 10.9.128.253
 
   #openstack_public_neutron_subnet_gateway: 172.17.16.1
   #openstack_public_neutron_subnet_cidr: 172.17.16.0/24
@@ -379,4 +379,4 @@
     password_regex_description: "Your password could contains capital letters, lowercase letters, digits, symbols '~ ! @ # % ^ & * _ = +' and have a minimum length of 32 characters"
     change_password_upon_first_use: False
 
-  stacklight_ssl_enabled: 'True'
\ No newline at end of file
+  stacklight_ssl_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
index fcb707f..193051c 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
@@ -13,7 +13,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.15
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     cid01:
       reclass_storage_name: cicd_control_node01
@@ -159,7 +159,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.121
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     prx02:
       reclass_storage_name: openstack_proxy_node02
@@ -173,7 +173,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.122
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     mon01:
       reclass_storage_name: stacklight_server_node01
@@ -318,9 +318,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw01:
       reclass_storage_name: openstack_gateway_node01
@@ -333,9 +333,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw02:
       reclass_storage_name: openstack_gateway_node02
@@ -348,9 +348,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw03:
       reclass_storage_name: openstack_gateway_node03
@@ -363,9 +363,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     osd<<count>>:
       reclass_storage_name: ceph_osd_rack01
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 f40e867..64f8c05 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay.hot
@@ -20,7 +20,7 @@
     default: "10.8.0.0/24"
   external_subnet_cidr:
     type: string
-    default: "192.168.200.0/24"
+    default: "10.9.0.0/16"
   management_subnet_cidr:
     type: string
     default: "10.7.0.0/24"
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index dc3f472..bab1394 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -225,7 +225,7 @@
   openstack_ovs_encapsulation_type: vxlan
   #openstack_proxy_address: 172.17.16.80  # external network endpoint
   openstack_proxy_address: 10.167.4.80  # external network endpoint
-  openstack_proxy_vip_interface: ens5
+  openstack_proxy_vip_interface: ens6
   openstack_proxy_hostname: prx
   openstack_proxy_node01_address: 10.167.4.81
   openstack_proxy_node01_hostname: prx01
@@ -300,9 +300,9 @@
   openstack_internal_protocol: 'https'
   openstack_create_public_network: 'True'
   openstack_public_neutron_subnet_gateway: 10.9.0.1
-  openstack_public_neutron_subnet_cidr: 10.9.0.0/24
-  openstack_public_neutron_subnet_allocation_start: 10.9.0.201
-  openstack_public_neutron_subnet_allocation_end: 10.9.0.245
+  openstack_public_neutron_subnet_cidr: 10.9.0.0/16
+  openstack_public_neutron_subnet_allocation_start: 10.9.128.5
+  openstack_public_neutron_subnet_allocation_end: 10.9.128.253
 
   #openstack_public_neutron_subnet_gateway: 172.17.16.1
   #openstack_public_neutron_subnet_cidr: 172.17.16.0/24
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-environment.yaml
index fcb707f..193051c 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-environment.yaml
@@ -13,7 +13,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.15
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     cid01:
       reclass_storage_name: cicd_control_node01
@@ -159,7 +159,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.121
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     prx02:
       reclass_storage_name: openstack_proxy_node02
@@ -173,7 +173,7 @@
         ens6:
           role: single_external
           external_address: 10.9.0.122
-          external_network_netmask: 255.255.255.0
+          external_network_netmask: 255.255.0.0
 
     mon01:
       reclass_storage_name: stacklight_server_node01
@@ -318,9 +318,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw01:
       reclass_storage_name: openstack_gateway_node01
@@ -333,9 +333,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw02:
       reclass_storage_name: openstack_gateway_node02
@@ -348,9 +348,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     gtw03:
       reclass_storage_name: openstack_gateway_node03
@@ -363,9 +363,9 @@
         ens4:
           role: single_ctl
         ens5:
-          role: bond0_ab_ovs_vxlan_mesh_no_tag
+          role: heat_single_tenant
         ens6:
-          role: bond1_ab_ovs_floating
+          role: heat_single_ovs_floating
 
     osd<<count>>:
       reclass_storage_name: ceph_osd_rack01
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
index 6c2845e..bd85be6 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay.hot
@@ -20,7 +20,7 @@
     default: "10.8.0.0/24"
   external_subnet_cidr:
     type: string
-    default: "192.168.200.0/24"
+    default: "10.9.0.0/16"
   management_subnet_cidr:
     type: string
     default: "10.7.0.0/24"