diff --git a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index 56f0c42..a392ae7 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -305,6 +305,7 @@
   openstack_message_queue_node03_address: 10.167.11.43
   openstack_message_queue_node03_hostname: msg03
   openstack_network_engine: ovs
+  openstack_ovs_dvr_enabled: 'False'
   openstack_neutron_qos: 'True'
   openstack_neutron_vlan_aware_vms: 'True'
   openstack_nfv_dpdk_enabled: 'False'
@@ -316,7 +317,6 @@
   openstack_nfv_sriov_pf_nic: enp5s0f1
   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: vxlan
   openstack_ovs_encapsulation_vlan_range: 2402:2406
   openstack_proxy_address: 10.167.11.80