diff --git a/tcp_tests/templates/cookied-bm-contrail-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-contrail-maas/lab04-physical-inventory.yaml
index fb0d8d1..69a9df0 100644
--- a/tcp_tests/templates/cookied-bm-contrail-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail-maas/lab04-physical-inventory.yaml
@@ -75,10 +75,3 @@
         enp5s0f1:
           role: single_vlan_ctl
           single_address: 10.167.8.102
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-contrail-nfv-maas/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-contrail-nfv-maas/lab04-physical-inventory.yaml
index e7177b5..3c5401c 100644
--- a/tcp_tests/templates/cookied-bm-contrail-nfv-maas/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail-nfv-maas/lab04-physical-inventory.yaml
@@ -79,10 +79,3 @@
           tenant_address: 192.168.0.102
           dpdk_pci: "'0000:05:00.0'"
           dpdk_mac: '00:1b:21:87:21:98'
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-contrail40-nfv/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-contrail40-nfv/lab04-physical-inventory.yaml
index 7f9014d..7e21691 100644
--- a/tcp_tests/templates/cookied-bm-contrail40-nfv/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40-nfv/lab04-physical-inventory.yaml
@@ -81,10 +81,3 @@
         enp2s0f0:
           role: single_vlan_ctl
           single_address: 10.167.8.102
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-contrail40/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-contrail40/lab04-physical-inventory.yaml
index 1639192..5cb47fb 100644
--- a/tcp_tests/templates/cookied-bm-contrail40/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-contrail40/lab04-physical-inventory.yaml
@@ -75,10 +75,3 @@
         enp5s0f1:
           role: single_vlan_ctl
           single_address: 10.167.8.102
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
index 724a6de..ad4e04a 100644
--- a/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-k8s-contrail/lab04-upgrade-physical-inventory.yaml
@@ -92,13 +92,6 @@
           role: single_dhcp
         ens11f1:
           role: k8s_oc40_only_vhost_on_control_vlan
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
           #    cmp001.bm-k8s-contrail.local:
           #      reclass_storage_name: kubernetes_compute_node001
           #      roles:
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
index f9ae84b..720c275 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-lab03-environment.yaml
@@ -95,10 +95,3 @@
           role: bond0_ab_dvr_vxlan_ctl_mesh_external
           external_address: 172.17.42.5
           external_network_netmask: 255.255.255.192
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/lab04-physical-inventory.yaml
index 164256c..e66753d 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail-nfv/lab04-physical-inventory.yaml
@@ -79,10 +79,3 @@
           tenant_address: 192.168.0.102
           dpdk_pci: "'0000:05:00.0'"
           dpdk_mac: '00:1b:21:87:21:98'
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
index 7614192..7bf4d2e 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ocata-contrail/lab04-physical-inventory.yaml
@@ -75,10 +75,3 @@
         enp5s0f1:
           role: single_vlan_ctl
           single_address: 10.167.8.102
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
diff --git a/tcp_tests/templates/cookied-bm-oc40-queens/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-oc40-queens/lab04-physical-inventory.yaml
index 76189cf..5aa9ebe 100644
--- a/tcp_tests/templates/cookied-bm-oc40-queens/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-oc40-queens/lab04-physical-inventory.yaml
@@ -60,13 +60,6 @@
         enp5s0f1:
           role: single_vlan_ctl
 
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: ctl01*
-
 #    cmp001.cookied-bm-oc40-queens.local:
 #      reclass_storage_name: openstack_compute_node01
 #      roles:
@@ -98,4 +91,4 @@
 #          tenant_address: 192.168.0.102
 #        enp5s0f1:
 #          role: single_vlan_ctl
-#          single_address: 10.167.8.102
\ No newline at end of file
+#          single_address: 10.167.8.102
diff --git a/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/lab04-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/lab04-physical-inventory.yaml
index c886b41..143a83f 100644
--- a/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/lab04-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-ocata-cicd-pipeline/lab04-physical-inventory.yaml
@@ -86,13 +86,6 @@
         enp9s0f1:
           role: bond0_ab_dvr_vxlan_ctl_mesh_floating
 
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
-
 #    gtw02.ocata-cicd.local:
 #      reclass_storage_name: openstack_gateway_node02
 #      roles:
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
index eee2067..4abe271 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/environment-context-k8s-sl.yaml
@@ -256,10 +256,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
index 2da8dc9..d13627b 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-calico/environment-context-k8s.yaml
@@ -143,10 +143,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl_calico
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
index 2c14f73..807d07f 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/environment-context-k8s-genie.yaml
@@ -157,10 +157,3 @@
           role: single_ctl_calico
         ens5:
           role: single_storage_dhcp
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
index c192d5f..bef76b3 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/environment-context.yaml
@@ -234,10 +234,3 @@
           role: single_ovs_br_floating
           external_address: 10.90.0.110
           external_network_netmask: 255.255.255.0
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
index c8fb940..77d8229 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/environment_context.yaml
@@ -266,10 +266,3 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
index aaedf48..6ffc515 100644
--- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/environment-context.yaml
@@ -264,10 +264,3 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
index 1fe8467..59e20b9 100644
--- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
+++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/environment_context.yaml
@@ -266,10 +266,3 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
index 4a6ee73..e6f71cf 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-environment.yaml
@@ -167,10 +167,3 @@
           role: single_ovs_br_floating
           external_address: 10.90.0.110
           external_network_netmask: 255.255.255.0
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/vcp-context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/vcp-context-environment.yaml
index 4fbb4b4..cc7acd1 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/vcp-context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/vcp-context-environment.yaml
@@ -205,11 +205,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
-
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-environment.yaml
index 00125aa..876aab9 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl-barbican/_context-environment.yaml
@@ -132,10 +132,3 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
index f5e74ab..158177e 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ssl/_context-environment.yaml
@@ -231,11 +231,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
-
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml
index 7c271fb..bcff533 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml
@@ -230,11 +230,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
-
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-environment.yaml
index 329bca0..23e0af4 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-environment.yaml
@@ -231,10 +231,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/vcp-context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/vcp-context-environment.yaml
index 6d9ed2d..8d62a09 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/vcp-context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/vcp-context-environment.yaml
@@ -210,10 +210,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-environment.yaml
index 6022fbd..ea7c7ec 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl-barbican/_context-environment.yaml
@@ -136,10 +136,3 @@
           role: bond0_ab_ovs_vxlan_mesh
         ens6:
           role: bond1_ab_ovs_floating
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml
index 7f21c48..5a90968 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml
@@ -235,10 +235,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
index a1bdfd4..ce8de58 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-environment.yaml
@@ -234,11 +234,4 @@
         ens3:
           role: single_dhcp
         ens4:
-          role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
+          role: single_ctl
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
index c932519..c2aab29 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-environment.yaml
@@ -235,11 +235,3 @@
           role: single_dhcp
         ens4:
           role: single_ctl
-
-environment_metadata:
-    public_gateway: 172.17.16.1
-    public_cidr: 172.17.16.0/24
-    public_allocation_start: 172.17.16.201
-    public_allocation_end: 172.17.16.245
-    tempest_test_target: gtw01*
-