diff --git a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
new file mode 100644
index 0000000..59648a9
--- /dev/null
+++ b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
@@ -0,0 +1,163 @@
+---
+
+  # Copyright 2020-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 Tucson pod
+  
+  # Change default values in tests
+  ONOS_REST_PORT: 30120
+  ONOS_SSH_PORT: 30115
+  OLT_PORT: 9191
+  KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+  
+  # This tells the control node how to reach the Kubernetes nodes.
+  nodes:
+    -
+      ip: '127.0.0.1'
+  
+  fabric_switches:
+    -
+      mac: '8c:ea:1b:a7:29:72'
+      ip: 10.34.90.55
+      user: root
+      pass: onl
+      bngPort: 157
+      device_id: 'of:0000000000000001'
+  
+  olts:
+  # Gpon OLT
+    -
+      ip:  10.34.90.50
+      sship:  10.34.90.50
+      user: root
+      pass: onl
+      fortygig: False
+      aggPort: 2
+      serial: EC1912001814
+      oltDebVersion: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+      oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+  
+  hosts:
+    src:
+      #GPON ONU
+      -
+        ip: 127.0.0.1
+        user: community
+        pass: admin
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: voltha-client-gpon-1
+        onu: SCOM00001c82
+        olt: EC1912001814
+        c_tag: 7
+        s_tag: 31
+        power_switch_port: 1
+      -
+        ip: 10.34.90.42
+        user: community
+        pass: admin
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: voltha-client-gpon-2
+        onu: SCOM00001c89
+        olt: EC1912001814
+        c_tag: 7
+        s_tag: 32
+        power_switch_port: 2
+      -
+        ip: 10.34.90.42
+        user: community
+        pass: admin
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: voltha-client-gpon-3
+        onu: SCOM00001c96
+        olt: EC1912001814
+        c_tag: 7
+        s_tag: 33
+        power_switch_port: 4
+      -
+        ip: 10.34.90.42
+        user: community
+        pass: admin
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: voltha-client-gpon-4
+        onu: SCOM00001c0b
+        olt: EC1912001814
+        c_tag: 7
+        s_tag: 34
+        power_switch_port: 7
+  
+    dst:
+      -
+        dp_iface_ip_qinq: 10.31.7.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.34.90.43
+        noroot_user: community
+        noroot_pass: admin
+        dp_iface_name: ens3f0
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.32.7.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.34.90.43
+        noroot_user: community
+        noroot_pass: admin
+        dp_iface_name: ens3f0
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.33.7.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.34.90.43
+        noroot_user: community
+        noroot_pass: admin
+        dp_iface_name: ens3f0
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.34.7.254
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: 10.34.90.43
+        noroot_user: community
+        noroot_pass: admin
+        dp_iface_name: ens3f0
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+  
+  web_power_switch:
+    ip: '10.34.90.48'
+    user: 'admin'
+    password: 'secret'
+    type: 'EPC'
+  
diff --git a/kubernetes-configs/dt-berlin-pod-openonugo.conf b/kubernetes-configs/dt-berlin-pod-openonugo.conf
new file mode 100755
index 0000000..92287ac
--- /dev/null
+++ b/kubernetes-configs/dt-berlin-pod-openonugo.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01Ea3lPVEE0TVRJek4xb1hEVE13TURreU56QTRNVEl6TjFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTmNhCmFiM1d4RHBqVm9rOTNEYURRU01IbFZMZm5IR1JVZDlWa3BPMm1VYnhBRkNSSWtKV05PNzd2cFVyUFlSOWtvQTMKRUwzeTZES09Ea0JVU281dGZ1YXh1SjYyY2ZVNWRTSmJENk9RVlFmN0NpTFh6Ylc4OXYyQXZ2MUhVeUFSazVGaQprN29MdDh4V0NiTlRBcytxVk9DcGgreDhyNDZDS1g4dU9JbDNGWFF4cEUxUzZ3cTZrcERtaHFvTmc0OEQwWDhKCk1yL0duRWNnMTBkOXN2dmkzcmpWRHEvK00xalZ2K2RTc0dnK0pFNlllaFhrMUZHNFZIUmp1VnFKSWtNck5JZlIKUW95bUk0VVlkaXVxQk13bDFLVngrdkgyTjJ1NUNYNUp6MWtxb3Awd1QvL0FucXJtNXdoVGhldXVrc1lZdUNsSQpQOHJ0ZzZRTVpqQ0kwMFc2UTRrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFEK3Q0Z29nbGdvOW9FVjlMTzlCNitHRkU1OFYKR0h4d1F5eElvRFJSVnNhSVpHK25jVG5BQ2hoKzVFODJ1UCtmS0t6NGRYR2xVcEI2aGxyZHVQdVd0ejg5YTRXNQp3L3p4d2VTUEdDeG9vSG5yRFRoZFpXSTYwd2kvU1VPVm43NS94czdqM2xlTzFxbS9YeEcrWDdrTFdJTTdqUW1NClAwOUtDOThFS3VVOFFlS0FnbEZab2l6bzcwdzd4dHpnMlZQSVFZTTYrbnhndFNUNWhYQWVTaXZKd296NElUS1IKQVRPVTVZbHordkhqWTNEbVpvR3V3OG13Zk1PTU9pSWNkS0NoZmZQdWd6cC9VUjlRVThmY3hhNWpKWCtVcFUrMwpmZllSSlV0SkVza3lEczQxR292RlNXWS91Vzd5TlNucEkrelVaMisxNi9wY1VJNE9RYm1UdGNiNklTUT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:44902
+  name: kind-voltha-minimal
+contexts:
+- context:
+    cluster: kind-voltha-minimal
+    user: kind-voltha-minimal
+  name: kind-voltha-minimal
+current-context: kind-voltha-minimal
+kind: Config
+preferences: {}
+users:
+- name: kind-voltha-minimal
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJWkx4VGpkMElTNXN3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBNU1qa3dPREV5TXpkYUZ3MHlNVEE1TWprd09ERXlOREphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXd1UTJKeVV1a1o0Nnd6MWQKNFQ4QXVDR1A2NTUvb2F6NzBUV0llbjlleFlxMFVXWXRrb3p1SVdzalZ0Vm9rUDVrMGZTVE9QS3pVdkc1ODBDUwp1cmEreE12d2RITnNEMXNmTFVlZ1VmL2VMVDhwejdUM2xkNyt3QWgvTjNMS3NzWWFhdmFwUTBBNkYxS0lyWTJyCjdWOU1rLy9lNG4vQmNNeG9XSlYzV3RCYmMrek5OZURuVzhLK2J5a1Nvc3dhOGtPbHBhZFZaaVBvaytCR1ZSbDMKSldxS3p6aUxpTkJwTTNRenZ3MzFrYm5KTVZNY0lOVXlmdksyaElERUhJSnhOTWQzSEtLKzVrOFN2bmpKbWR1RQp5MWJmcUdrcCtOckphN2Q1WjNYb1dhdVlycUZDZldRNlI4cFNzK1hSNFBZanRBVGZGZHBnSVA2cGJsWkVybkRxCjhmTVZqUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFRFoxTkoyQjQzeVdEOENmbHhLQjFOa05MS2tCNGJkNlJPVAp2YUJNa0hWY3B4Tzgrckp1VzMyZTVVSnkwRW5VRGtWU3Q4Mko3aWxqeW5JTDViNE1wQ3B5cWttQkxHeVVDaUc0ClJmajl4VEI4ekt6L3JQY3ZZa1EveW9OR0haeDZ1L1BYd2luZDBjVHZ2RHNJaEtGVTNHU2FxdWtGeTBZZ1lmMUoKRU1xZkIvNmMzQ0pWdWp5VlNOMU1Zayt3SjZ5U21UVjFOcXNNTytFUnVCUTVsUXowbnRkVE92UVZpTGtLYUFidQowLzFRancxNUQxVjM5YzNJaHQ1VUUzeDVhQ2ZmZDFqaE9PdWxaRFl6VnVaZmRRVzEwd045c1BFaWQ2bFRKNktyClQ1K0JwUWV4ayszVXUzQUl3NXFGWmErUE9sSWU5VUFlUStoUzc4a1Zrdkg2bksvV3lPND0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBd3VRMkp5VXVrWjQ2d3oxZDRUOEF1Q0dQNjU1L29hejcwVFdJZW45ZXhZcTBVV1l0CmtvenVJV3NqVnRWb2tQNWswZlNUT1BLelV2RzU4MENTdXJhK3hNdndkSE5zRDFzZkxVZWdVZi9lTFQ4cHo3VDMKbGQ3K3dBaC9OM0xLc3NZYWF2YXBRMEE2RjFLSXJZMnI3VjlNay8vZTRuL0JjTXhvV0pWM1d0QmJjK3pOTmVEbgpXOEsrYnlrU29zd2E4a09scGFkVlppUG9rK0JHVlJsM0pXcUt6emlMaU5CcE0zUXp2dzMxa2JuSk1WTWNJTlV5CmZ2SzJoSURFSElKeE5NZDNIS0srNWs4U3ZuakptZHVFeTFiZnFHa3ArTnJKYTdkNVozWG9XYXVZcnFGQ2ZXUTYKUjhwU3MrWFI0UFlqdEFUZkZkcGdJUDZwYmxaRXJuRHE4Zk1WalFJREFRQUJBb0lCQVFDTFhNV2NtR29FbHpGTwpDOFBtSGpkVmRDcUdRb0RpQytER2FaRitoell0N0ZHbEkzdlRJQlBvc2NSRGc3ZVNkMWVCQzNON2RaSGw3aFVhCmJVSi9ZYzVveTZ6V21QTGN5RHd6Rk5UL3pnZ0NNdmlqSHJVczVwa2ttTzdmcDZacTBGNXp2bzZyR0hKeDJ3TUIKbUIwcFVNeGh5TWFKRVBJeXh2aVczOHJKbGRUUHYzUG9IVkpQYVZhQlE4SXRJMGxwcS90OTdZSUE3RzRwQ2hlZwpkbjBCY1pGN2pxNXkwZ3RmcUJmemt3T2JnSk5kajVXTVlYYmlJQjRuTmwvSkRhZE9VL2NLSG5tQUVPNWZuZFoyCjZXM2hDYnduYzQzUlJPOVgvM2l3d0x2VEg2T0MrU2JFbGlOcHJ3TlVrdlNLRVdFelJFTEpucWdOVmdxbU1IRGYKWXJtR3Nab0JBb0dCQVB4ajZFcW1CQkxxeEJWWjVDQmhlaGdUZ1ZZUjVoTXN2YnhSQTVLSHhNd1Bab3pDNUZyawp0aHNtOGVyR3hkYWlBZkxlY2p4NFNkRmZvd1czWnl0NVFibk9VR2Z4NXFucVlWVWVDV3hxaFNBTDE3ZU1SKzJKCkNUajdYSkthVURVcmdOcGg2Tkh2VFFFZHFCSk5uTTB2NUduWERxejNHZGM1dnhJaEdIdHdRS01GQW9HQkFNV3QKeDdLVUNBNGl6RWVTU3p0Q2NoOTZVM0pieEVNOHN5OS9WUmt3T21aUWVDM0pnTHg5ZTgzTlJ3RXZ5ck0wSkF0NgpNcktJUFFvcGo2ZlpNSzhTM05tTUZhbTdjOGUrYjhqNXJnODdNZWZsdVo5L1F6dUZGR3V2V002d3lTRVNranp4CmRXdXErODR6eXRvLzJRN1NPL1RkRXBMWXk1c1RVVHpIY3JIaGJiN3BBb0dBRjd6OTJDZU5Nb3BLTHdmcFlQSksKSFlHWUpKUkNZNE5OeFN5SmZYcXZrOUhPLzJaRlBCZE8yWGJzUWZ5NEZ0dmQrdzNaQ0w3M2ttM0FVNFZRZXRKSQowRVVMWXZ0cGlvbTA1ZUNSV2xVYWVFMGsyT3FreVQ2ZVUzR3czMGtNU2pQeFJwajI0T2YxQWluYjZQekx4ckMrCmR3WDNKMldHVkt2bHdMckVKcmdFSEZFQ2dZQkRFVG11bWRDOTB3cVJ3YzJxZGxtMzJrM1RmOVR2cHZsNFJQQS8KVW9DTjFBRmlMM3B3K1BYM0ZnMWdGckhqNk8zTnd4RE9SN0RGOE9IZlphM0J5Rm1McVo1ejdyaFNiWWNKbmNSegpRSGNuSVdhLytYSjdFQ1NrZ0dKV0JkN0hUTUMyMG9rdkZWekhVZ1VoMVFXMHBKbFk4MlJvMUFzSU94NlZ5MmxiCmRvdEFlUUtCZ1FEbEJoNjBucTBUZDRkdGkxRmIxaHZqRE9KWHJOaEtkNjMwMEZLRWNWVkM5NHp4aHliM081Z1gKSDlVY201UDdvTGpEaTNuS0F2bnNtZEwrUnR0bGIzZHp4enhlamJKSHRkdmdKT0JDeFVzdGFhREF6dElrTEc5UApjM3NKY2dTK2krc3kxTEw5NmkrY1ZvNVI1T21aU2FJMVBIYldkZGhlcW5WczJZcHZkK2J2cXc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml b/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml
new file mode 100644
index 0000000..7ceb738
--- /dev/null
+++ b/kubernetes-configs/voltha/dt-berlin-pod-openonugo.yml
@@ -0,0 +1,69 @@
+# 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
+
+adapter_open_onu:
+  repository: voltha/voltha-openonu-adapter-go
+  tag: master
+
+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/tosca-configs/voltha/dt-berlin-pod-openonugo-onos-netcfg-switch.json b/tosca-configs/voltha/dt-berlin-pod-openonugo-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/dt-berlin-pod-openonugo-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "agg-switch",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}