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