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 f73de65..1cefe2f 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
@@ -5,6 +5,7 @@
       - openstack_control_leader
       - linux_system_codename_xenial
       - features_ironic_baremetal_nodes
+      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp
@@ -16,6 +17,7 @@
       roles:
       - openstack_control
       - linux_system_codename_xenial
+      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp
@@ -27,6 +29,7 @@
       roles:
       - openstack_control
       - linux_system_codename_xenial
+      - features_ironic_switch
       interfaces:
         ens2:
           role: single_dhcp