diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-environment.yaml
index c687eac..7722eaa 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-environment.yaml
@@ -24,6 +24,10 @@
           role: bond_ctl_lacp
         sten2:
           role: bond_ctl_lacp
+        ten1:
+          role: bond_baremetal_lacp
+        sten1:
+          role: bond_baremetal_lacp
 
     kvm02.bm-cicd-queens-ovs-maas.local:
       reclass_storage_name: infra_kvm_node02
@@ -37,6 +41,10 @@
           role: bond_ctl_lacp
         sten2:
           role: bond_ctl_lacp
+        ten1:
+          role: bond_baremetal_lacp
+        sten1:
+          role: bond_baremetal_lacp
 
     kvm03.bm-cicd-queens-ovs-maas.local:
       reclass_storage_name: infra_kvm_node03
@@ -50,6 +58,10 @@
           role: bond_ctl_lacp
         sten2:
           role: bond_ctl_lacp
+        ten1:
+          role: bond_baremetal_lacp
+        sten1:
+          role: bond_baremetal_lacp
 
     kvm04.bm-cicd-queens-ovs-maas.local:
       reclass_storage_name: infra_kvm_node04
@@ -133,11 +145,11 @@
         one1:
           role: single_mgm_dhcp
         ten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         ten2:
           role: bond_prv_lacp
         sten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         sten2:
           role: bond_prv_lacp
 
@@ -150,11 +162,11 @@
         one1:
           role: single_mgm_dhcp
         ten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         ten2:
           role: bond_prv_lacp
         sten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         sten2:
           role: bond_prv_lacp
 
@@ -167,10 +179,10 @@
         one1:
           role: single_mgm_dhcp
         ten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         ten2:
           role: bond_prv_lacp
         sten1:
-          role: bond_ctl_lacp
+          role: bond_ctl_baremetal_lacp
         sten2:
           role: bond_prv_lacp