diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
index aa0d838..001131c 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
@@ -18,10 +18,12 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp3s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp3s0f1:
-          role: bond0_ab_ovs_vlan_ctl
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
 
     kvm02.cookied-cicd-ovs-maas.local:
       reclass_storage_name: infra_kvm_node02
@@ -29,10 +31,12 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp3s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp3s0f1:
-          role: bond0_ab_ovs_vlan_ctl
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
 
     kvm03.cookied-cicd-ovs-maas.local:
       reclass_storage_name: infra_kvm_node03
@@ -40,10 +44,54 @@
       - infra_kvm
       - linux_system_codename_xenial
       interfaces:
-        enp3s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp3s0f1:
-          role: bond0_ab_ovs_vlan_ctl
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
+
+    kvm04.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node04
+      roles:
+      - infra_kvm_wo_gluster
+      - linux_system_codename_xenial
+      - salt_master_host
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
+
+    kvm05.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node05
+      roles:
+      - infra_kvm_wo_gluster
+      - linux_system_codename_xenial
+      - salt_master_host
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
+
+    kvm06.cookied-cicd-ovs-maas.local:
+      reclass_storage_name: infra_kvm_node06
+      roles:
+      - infra_kvm_wo_gluster
+      - linux_system_codename_xenial
+      - salt_master_host
+      interfaces:
+        one1:
+          role: single_mgm_dhcp
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
 
     osd<<count>>:
       reclass_storage_name: ceph_osd_rack01
@@ -51,10 +99,12 @@
       - ceph_osd
       - linux_system_codename_xenial
       interfaces:
-        enp9s0f0:
-          role: single_dhcp
-        enp9s0f1:
-          role: single_vlan_ctl
+        one1:
+          role: single_mgm_dhcp
+        ten2:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_ctl_lacp
 #          role: bond0_ab_vlan_ceph_storage_backend
 
     cmp<<count>>:
@@ -63,10 +113,16 @@
       - openstack_compute
       - linux_system_codename_xenial
       interfaces:
-        enp9s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp9s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_prv_lacp
+        sten1:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_prv_lacp
 
     gtw01.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node01
@@ -74,12 +130,16 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        enp3s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp3s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_external
-          external_address: 172.17.42.5
-          external_network_netmask: 255.255.255.192
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_prv_lacp
+        sten1:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_prv_lacp
 
     gtw02.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node02
@@ -87,12 +147,16 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        enp3s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp3s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_external
-          external_address: 172.17.42.6
-          external_network_netmask: 255.255.255.192
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_prv_lacp
+        sten1:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_prv_lacp
 
     gtw03.cookied-cicd-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node03
@@ -100,9 +164,13 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        enp2s0f0:
+        one1:
           role: single_mgm_dhcp
-        enp2s0f1:
-          role: bond0_ab_dvr_vxlan_ctl_mesh_external
-          external_address: 172.17.42.7
-          external_network_netmask: 255.255.255.192
+        ten1:
+          role: bond_ctl_lacp
+        ten2:
+          role: bond_prv_lacp
+        sten1:
+          role: bond_ctl_lacp
+        sten2:
+          role: bond_prv_lacp