diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
index b3849e4..ff6b7ca 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
@@ -68,12 +68,10 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        one1:
+        ens2:
           role: single_mgm_dhcp
-        ten1:
-          role: bond_ctl_lacp
-        ten2:
-          role: bond_ctl_lacp
+        ens3:
+          role: single_ctl
 
     gtw02.bm-e7-cicd-pike-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node02
@@ -81,12 +79,10 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        one1:
+        ens2:
           role: single_mgm_dhcp
-        ten1:
-          role: bond_ctl_lacp
-        ten2:
-          role: bond_ctl_lacp
+        ens3:
+          role: single_ctl
 
     gtw03.bm-e7-cicd-pike-ovs-maas.local:
       reclass_storage_name: openstack_gateway_node03
@@ -94,9 +90,7 @@
       - openstack_gateway
       - linux_system_codename_xenial
       interfaces:
-        one1:
+        ens2:
           role: single_mgm_dhcp
-        ten1:
-          role: bond_ctl_lacp
-        ten2:
-          role: bond_ctl_lacp
+        ens3:
+          role: single_ctl