diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 4c2f81e..74e0912 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -190,7 +190,7 @@
                 devices:
                   - sdb
                 volume:
-                  cinder-volumes-pool:
+                  cinder-vg-pool:
                     size: 800G
           power_parameters:
             power_address: "5.43.227.11"
@@ -243,7 +243,7 @@
                 devices:
                   - sdb
                 volume:
-                  cinder-volumes-pool:
+                  cinder-vg-pool:
                     size: 800G
           power_parameters:
             power_address: "5.43.227.19"
@@ -263,10 +263,10 @@
   openstack_cluster_size: compact
   openstack_compute_count: '2'
   openstack_compute_rack01_hostname: cmp
-  openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.16
+  openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.254
   openstack_compute_deploy_address_ranges: 172.16.162.73-172.16.162.74
-  openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.16
-  openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.16
+  openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.254
+  openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.254
   openstack_control_address: 10.167.11.10
   openstack_control_hostname: ctl
   openstack_control_node01_address: 10.167.11.11
@@ -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