diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index e6cb220..42bf3e9 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -702,7 +702,6 @@
   openstack_proxy_node02_hostname: prx02
   openstack_upgrade_node01_address: 10.167.11.19
   openstack_version: pike
-  cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
@@ -743,7 +742,6 @@
   tenant_vlan: '2406'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  sriov_network_subnet: 192.168.10.0/24
   ceph_enabled: 'True'
   ceph_version: "luminous"
   ceph_hyper_converged: "False"
@@ -822,7 +820,6 @@
   openstack_public_neutron_subnet_allocation_start: 172.17.42.20
   openstack_public_neutron_subnet_allocation_end: 172.17.42.55
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 b83e16f..e2f4d14 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
@@ -716,7 +716,6 @@
   openstack_proxy_node02_hostname: prx02
   openstack_upgrade_node01_address: 10.167.11.19
   openstack_version: queens
-  cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
@@ -757,7 +756,6 @@
   tenant_vlan: '2406'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  sriov_network_subnet: 192.168.10.0/24
   ceph_enabled: 'True'
   ceph_version: "nautilus"
   ceph_hyper_converged: "False"
@@ -846,7 +844,6 @@
   openstack_public_neutron_subnet_allocation_start: 172.17.42.20
   openstack_public_neutron_subnet_allocation_end: 172.17.42.55
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 b8024a6..56f0c42 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
@@ -327,7 +327,6 @@
   openstack_proxy_node02_hostname: prx02
   openstack_upgrade_node01_address: 10.167.11.19
   openstack_version: pike
-  cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
@@ -368,7 +367,6 @@
   tenant_vlan: '2406'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  sriov_network_subnet: 192.168.10.0/24
   ceph_enabled: 'False'
 
   rsync_fernet_rotation: 'True'
@@ -409,7 +407,6 @@
   openstack_public_neutron_subnet_allocation_start: 172.17.42.82
   openstack_public_neutron_subnet_allocation_end: 172.17.42.112
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
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 957a961..4c2f81e 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
@@ -327,7 +327,6 @@
   openstack_proxy_node02_hostname: prx02
   openstack_upgrade_node01_address: 10.167.11.19
   openstack_version: pike
-  cinder_version: ${_param:openstack_version}
   platform: openstack_enabled
   public_host: ${_param:openstack_proxy_address}
   salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
@@ -368,7 +367,6 @@
   tenant_vlan: '2406'
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  sriov_network_subnet: 192.168.10.0/24
   ceph_enabled: 'False'
 
   rsync_fernet_rotation: 'True'
@@ -409,7 +407,7 @@
   openstack_public_neutron_subnet_allocation_start: 172.17.42.82
   openstack_public_neutron_subnet_allocation_end: 172.17.42.112
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
+
   manila_enabled: 'False'
   openscap_enabled: 'True'
   octavia_health_manager_node01_address: 192.168.1.10
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 5507f1d..50653c2 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -82,7 +82,6 @@
   control_vlan: '2404'
   tenant_vlan: '2406'
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
   jenkins_pipelines_branch: 'release/2019.2.0'
 
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index b0d3413..d08c4c8 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -82,7 +82,6 @@
   control_vlan: '2404'
   tenant_vlan: '2406'
   backend_vlan: '2402'
-  storage_vlan: '2405'  # not implemented yet, placeholder
   jenkins_pipelines_branch: 'release/2019.2.0'
 
   deploy_network_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index fdc9485..46d274d 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -242,7 +242,6 @@
   salt_master_address: 10.167.4.15
   salt_master_hostname: cfg01
   salt_master_management_address: 10.167.5.15
-  sriov_network_subnet: 10.55.0.0/16
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.6.1
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 99b442b..74f38a1 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -247,7 +247,6 @@
   salt_master_address: 10.167.4.15
   salt_master_hostname: cfg01
   salt_master_management_address: 10.167.5.15
-  sriov_network_subnet: 10.55.0.0/16
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.6.1
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 4adf981..bb3d663 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -228,7 +228,6 @@
   salt_master_address: 10.167.4.15
   salt_master_hostname: cfg01
   salt_master_management_address: 10.167.5.15
-  sriov_network_subnet: 10.55.0.0/16
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.6.1
   tenant_network_netmask: 255.255.255.0
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index d358016..d938412 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -246,7 +246,6 @@
   salt_master_address: 10.167.4.15
   salt_master_hostname: cfg01
   salt_master_management_address: 10.167.5.15
-  sriov_network_subnet: 10.55.0.0/16
   static_ips_on_deploy_network_enabled: 'False'
   tenant_network_gateway: 10.167.6.1
   tenant_network_netmask: 255.255.255.0