diff --git a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
index 1aaf8e5..0cc20a9 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
 
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml b/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml
deleted file mode 100644
index 17a2e59..0000000
--- a/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019 Ciena Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
-
-onosSshPort: 30115
-onosApiPort: 30120
-onosOfPort: 31653
-
-individualOpenFlowNodePorts: true
-
-use_openonu_adapter_go: true
-
-#images:
-#  adapter_open_onu_go:
-#    repository: andreacampanella/voltha-openonu-adapter-go
-#    tag: omci-msg-info
-
-deployments:
-  etcdOperator: true
-  backupOperator: false
-  restoreOperator: false
-
-voltha-etcd-cluster:
-  clusterSize: 1
-onos_env:
-- name: POD_IP
-  valueFrom:
-  fieldRef:
-    fieldPath: status.podIP
-- name: NAMESPACE
-  valueFrom:
-  fieldRef:
-    fieldPath: metadata.namespace
-- name: ONOS_APPS
-  value: "drivers,openflow-base,hostprovider"
-
-apps:
-  - org.onosproject.lldpprovider
-  - org.onosproject.openflow-base
-  - org.onosproject.gui2
-  - org.onosproject.drivers
-  - org.onosproject.mcast
-  - org.opencord.kafka
-  - org.opencord.sadis
-  - org.opencord.dhcpl2relay
-  - org.opencord.igmpproxy
-  - org.opencord.mcast
-  - org.opencord.olt
-  - org.opencord.aaa
-
-atomix:
-  persistence:
-    enabled: false
-
-# Customization for BBSIM
-kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-pon_ports: 1
-onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/dt-berlin-pod.yml b/kubernetes-configs/voltha/dt-berlin-pod.yml
index 86d17db..4723038 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
 
diff --git a/kubernetes-configs/voltha/flex-ocp-cord-openonupy.yml b/kubernetes-configs/voltha/flex-ocp-cord-openonupy.yml
deleted file mode 100644
index d5c0c7b..0000000
--- a/kubernetes-configs/voltha/flex-ocp-cord-openonupy.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2019 Ciena Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
-
-onosSshPort: 30115
-onosApiPort: 30120
-onosOfPort: 31653
-
-individualOpenFlowNodePorts: true
-
-use_openonu_adapter_go: false
-
-#images:
-#  adapter_open_onu_go:
-#    repository: andreacampanella/voltha-openonu-adapter-go
-#    tag: mcast-ac-final
-#  onos:
-#    repository: voltha/voltha-onos@sha256
-#    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666
-#  adapter_open_onu:
-#     repository: gcgirish/voltha-openonu-adapter
-#     tag: ttfix
-#  adapter_open_olt:
-#    repository: gcgirish/voltha-openolt-adapter
-#    tag: fixAction
-#  rw_core:
-#    repository: gcgirish/voltha-rw-core
-#    tag: delete-device
-
-deployments:
-  etcdOperator: true
-  backupOperator: false
-  restoreOperator: false
-
-voltha-etcd-cluster:
-  clusterSize: 1
-onos_env:
-- name: POD_IP
-  valueFrom:
-  fieldRef:
-    fieldPath: status.podIP
-- name: NAMESPACE
-  valueFrom:
-  fieldRef:
-    fieldPath: metadata.namespace
-- name: ONOS_APPS
-  value: "drivers,openflow-base,hostprovider"
-
-apps:
-  - org.onosproject.lldpprovider
-  - org.onosproject.openflow-base
-  - org.onosproject.gui2
-  - org.onosproject.drivers
-  - org.onosproject.mcast
-  - org.opencord.kafka
-  - org.opencord.sadis
-  - org.opencord.dhcpl2relay
-  - org.opencord.igmpproxy
-  - org.opencord.mcast
-  - org.opencord.olt
-  - org.opencord.aaa
-
-atomix:
-  persistence:
-    enabled: false
-
-# Customization for BBSIM
-kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-pon_ports: 1
-onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
index 2302f5a..b9a3414 100644
--- a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
 
diff --git a/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml b/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml
deleted file mode 100644
index 06b0e92..0000000
--- a/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2019 Ciena Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
-
-onosSshPort: 30115
-onosApiPort: 30120
-onosOfPort: 31653
-
-individualOpenFlowNodePorts: true
-
-#images:
-#  onos:
-#    repository: voltha/voltha-onos@sha256
-#    tag: 6f23767b85a6515bc465c4678c945d194551dd27abe2cf1b926a524b5e9eb3e6
-#  adapter_open_onu:
-#    repository: gcgirish/voltha-openonu-adapter
-#    tag: tpstate
-#  adapter_open_olt:
-#    repository: gcgirish/voltha-openolt-adapter
-#    tag: ofagentRestartCrashFix
-#  rw_core:
-#    repository: khagerma/voltha-rw-core
-#    tag: update-port-fix
-deployments:
-  etcdOperator: true
-  backupOperator: false
-  restoreOperator: false
-
-nodeAffinityConfig:
-  enabled: true
-  node_label_key: "in-band"
-  node_label_value: "yes"
-
-voltha-etcd-cluster:
-  clusterSize: 1
-onos_env:
-- name: POD_IP
-  valueFrom:
-  fieldRef:
-    fieldPath: status.podIP
-- name: NAMESPACE
-  valueFrom:
-  fieldRef:
-    fieldPath: metadata.namespace
-- name: ONOS_APPS
-  value: "drivers,openflow-base,hostprovider"
-
-apps:
-  - org.onosproject.lldpprovider
-  - org.onosproject.openflow-base
-  - org.onosproject.gui2
-  - org.onosproject.drivers
-  - org.onosproject.mcast
-  - org.opencord.kafka
-  - org.opencord.sadis
-  - org.opencord.dhcpl2relay
-  - org.opencord.igmpproxy
-  - org.opencord.mcast
-  - org.opencord.olt
-  - org.opencord.aaa
-
-atomix:
-  persistence:
-    enabled: false
-
-# Customization for BBSIM
-kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
-pon_ports: 1
-onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/onf-soak-pod-openonugo.yml b/kubernetes-configs/voltha/onf-soak-pod-openonugo.yml
deleted file mode 100644
index 0f8adf7..0000000
--- a/kubernetes-configs/voltha/onf-soak-pod-openonugo.yml
+++ /dev/null
@@ -1,70 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
-
-defaults:
-  image_tag: master
-  image_pullPolicy: Always
-
-onosSshPort: 30115
-onosApiPort: 30120
-onosOfPort: 31653
-
-individualOpenFlowNodePorts: true
-
-use_openonu_adapter_go: true
-
-#images:
-#  adapter_open_onu_go:
-#    repository: andreacampanella/voltha-openonu-adapter-go
-#    tag: omci-msg-info
-
-onos_env:
-- name: POD_IP
-  valueFrom:
-  fieldRef:
-    fieldPath: status.podIP
-- name: NAMESPACE
-  valueFrom:
-  fieldRef:
-    fieldPath: metadata.namespace
-- name: ONOS_APPS
-  value: "drivers,openflow-base,hostprovider"
-
-apps:
-  - org.onosproject.lldpprovider
-  - org.onosproject.openflow-base
-  - org.onosproject.gui2
-  - org.onosproject.drivers
-  - org.onosproject.mcast
-  - org.opencord.kafka
-  - org.opencord.sadis
-  - org.opencord.dhcpl2relay
-  - org.opencord.igmpproxy
-  - org.opencord.mcast
-  - org.opencord.olt
-  - org.opencord.aaa
-
-atomix:
-  persistence:
-    enabled: false
-
-application_logs: |
-  log4j.logger.org.opencord.olt = DEBUG
-  log4j.logger.org.opencord.kafka = DEBUG
-  log4j.logger.org.opencord.sadis = DEBUG
-  log4j.logger.org.opencord.aaa = DEBUG
-  log4j.logger.org.opencord.dhcpl2relay = DEBUG
diff --git a/kubernetes-configs/voltha/onf-soak-pod.yml b/kubernetes-configs/voltha/onf-soak-pod.yml
index 30bb804..9b5ce05 100644
--- a/kubernetes-configs/voltha/onf-soak-pod.yml
+++ b/kubernetes-configs/voltha/onf-soak-pod.yml
@@ -15,7 +15,7 @@
 
 # Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always
 
diff --git a/kubernetes-configs/voltha/onlab-pod1.yml b/kubernetes-configs/voltha/onlab-pod1.yml
index 121835d..5637187 100644
--- a/kubernetes-configs/voltha/onlab-pod1.yml
+++ b/kubernetes-configs/voltha/onlab-pod1.yml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-defaults:
+global:
   image_tag: master
   image_pullPolicy: Always