diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-vcp-environment.yaml
index 1cefe2f..c274129 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-vcp-environment.yaml
@@ -4,8 +4,6 @@
       roles:
       - openstack_control_leader
       - linux_system_codename_xenial
-      - features_ironic_baremetal_nodes
-      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp
@@ -17,7 +15,6 @@
       roles:
       - openstack_control
       - linux_system_codename_xenial
-      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp
@@ -29,7 +26,6 @@
       roles:
       - openstack_control
       - linux_system_codename_xenial
-      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp
@@ -420,6 +416,8 @@
           role: single_dhcp
         ens3:
           role: single_ctl
+        ens4:
+          role: single_baremetal
 
     bmt02.bm-cicd-queens-ovs-maas.local:
       reclass_storage_name: openstack_baremetal_node02
@@ -431,6 +429,8 @@
           role: single_dhcp
         ens3:
           role: single_ctl
+        ens4:
+          role: single_baremetal
 
     bmt03.bm-cicd-queens-ovs-maas.local:
       reclass_storage_name: openstack_baremetal_node03
@@ -442,4 +442,6 @@
           role: single_dhcp
         ens3:
           role: single_ctl
+        ens4:
+          role: single_baremetal