diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 96af1d4..4a7286e 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -1,13 +1,16 @@
 default_context:
   ironic_enabled: True
   openstack_baremetal_hostname: bmt
-  openstack_baremetal_address_baremetal: 10.167.11.20
-  openstack_baremetal_node01_baremetal_address: 10.167.11.21
-  openstack_baremetal_node02_baremetal_address: 10.167.11.22
-  openstack_baremetal_node03_baremetal_address: 10.167.11.23
+  openstack_baremetal_address_baremetal: 10.14.0.10
+  openstack_baremetal_node01_baremetal_address: 10.14.0.11
+  openstack_baremetal_node02_baremetal_address: 10.14.0.12
+  openstack_baremetal_node03_baremetal_address: 10.14.0.13
   openstack_baremetal_node01_address: 10.167.11.21
   openstack_baremetal_node02_address: 10.167.11.22
   openstack_baremetal_node03_address: 10.167.11.23
+  openstack_baremetal_neutron_subnet_cidr: 10.14.0.0/24
+  openstack_baremetal_neutron_subnet_allocation_start: 10.14.0.100
+  openstack_baremetal_neutron_subnet_allocation_end: 10.14.0.200
   openstack_baremetal_address: 10.167.11.20
   openstack_baremetal_interface: ens7
   openstack_baremetal_vip_interface: phy-baremetal
@@ -708,8 +711,8 @@
   openstack_nova_cpu_pinning: 6,7,8,9,10,11
   openstack_nova_compute_reserved_host_memory_mb: '900'
   openstack_ovs_dvr_enabled: 'True'
-  openstack_ovs_encapsulation_type: vlan
-  openstack_ovs_encapsulation_vlan_range: 2402:2406
+  openstack_ovs_encapsulation_type: vxlan
+  ironic_vlan_range: 2402:2402
   openstack_proxy_address: 10.167.11.80
   openstack_proxy_hostname: prx
   openstack_proxy_node01_address: 10.167.11.81
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
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
 
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
index 5aee981..f34cc38 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-cicd-queens-ovs-maas.yaml
@@ -36,6 +36,7 @@
     sed -i 's/br\-ctl/br\_ctl/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
     sed -i 's/br\-mgm/br\_mgm/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
     sed -i 's/br\-ctl/br\_ctl/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/gateway.yml;
+    sed -i 's/br\-baremetal/br\_baremetal/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
     salt '*' saltutil.refresh_pillar;
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 1, delay: 10}