diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index e8e3db7..57f13a4 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -34,8 +34,6 @@
       user: root
       pass: onl
       bngPort: 157
-      #GPON
-      oltPort: 2
       device_id: 'of:0000000000000001'
   
   olts:
@@ -45,7 +43,9 @@
       user: root
       pass: onl
       fortygig: False
+      aggPort: 2
       serial: EC1912001814
+      oltDebVersion: openolt_asgvolt64.deb
   
   hosts:
     src:
@@ -58,6 +58,7 @@
         container_type: LXC
         container_name: voltha-client-gpon-1
         onu: SCOM00001c82
+        olt: EC1912001814
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
@@ -69,6 +70,7 @@
         container_type: LXC
         container_name: voltha-client-gpon-2
         onu: SCOM00001c89
+        olt: EC1912001814
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
@@ -80,6 +82,7 @@
         container_type: LXC
         container_name: voltha-client-gpon-3
         onu: SCOM00001c96
+        olt: EC1912001814
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt.yaml
new file mode 100644
index 0000000..0b7d0da
--- /dev/null
+++ b/deployment-configs/dt-berlin-pod-multi-olt.yaml
@@ -0,0 +1,180 @@
+---
+
+  # 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
+      user: root
+      pass: onl
+      fortygig: False
+      aggPort: 2
+      serial: EC1912001814
+      oltDebVersion: openolt_asgvolt64.deb
+  # XGS-PON OLT
+    -
+      ip: 10.34.90.51
+      user: root
+      pass: onl
+      fortygig: False
+      aggPort: 1
+      serial: EC1729003539
+      oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.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
+        #XGSPON ONU
+      -
+        ip: 127.0.0.1
+        user: community
+        pass: admin
+        dp_iface_name: eth1
+        container_type: LXC
+        container_name: voltha-client
+        onu: ALPHe3d1cf5c
+        olt: EC1729003539
+        c_tag: 11
+        s_tag: 11
+        power_switch_port: 6
+      -
+        ip: 127.0.0.1
+        user: community
+        pass: admin
+        dp_iface_name: eth1
+        container_type: LXC
+        container_name: voltha-client-dt
+        onu: ALPHe3a69d03
+        olt: EC1729003539
+        c_tag: 7
+        s_tag: 11
+        power_switch_port: 8
+
+    dst:
+      -
+        dp_iface_ip_qinq: 10.31.7.254
+        ip: null
+        user: null
+        pass: null
+        dp_iface_name: null
+        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
+        dp_iface_name: null
+        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
+        dp_iface_name: null
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.11.2.254
+        ip: null
+        user: null
+        pass: null
+        dp_iface_name: null
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        dp_iface_ip_qinq: 10.11.7.254
+        ip: null
+        user: null
+        pass: null
+        dp_iface_name: null
+        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'
\ No newline at end of file
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index f8c6ab8..f866aa1 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -34,8 +34,6 @@
     user: root
     pass: onl
     bngPort: 157
-    #XGSPON
-    oltPort: 1
     device_id: 'of:0000000000000001'
 
 olts:
@@ -45,7 +43,10 @@
     user: root
     pass: onl
     fortygig: False
+    aggPort: 1
     serial: 'EC1729003539'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
+
 
 hosts:
   src:
@@ -58,6 +59,7 @@
       container_type: LXC
       container_name: voltha-client
       onu: ALPHe3d1cf5c
+      olt: EC1729003539
       c_tag: 11
       s_tag: 11
       power_switch_port: 6
@@ -69,6 +71,7 @@
       container_type: LXC
       container_name: voltha-client-dt
       onu: ALPHe3a69d03
+      olt: EC1729003539
       c_tag: 7
       s_tag: 11
       power_switch_port: 8
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 49d4df0..f93ee72 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -39,7 +39,6 @@
     user: 'root'
     pass: 'onl'
     bngPort: '3'
-    oltPort: '10'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +47,9 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    aggPort: '10'
     serial: 'EC1838000853'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
 
 onus:
   -
@@ -64,6 +65,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1cfa7'
+      olt: 'EC1838000853'
       c_tag: '901'
       s_tag: '111'
       power_switch_port: 5
@@ -75,6 +77,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
       c_tag: '801'
       s_tag: '111'
       power_switch_port: 1
@@ -86,6 +89,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
       c_tag: '101'
       s_tag: '222'
       power_switch_port: 2
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index 7744ab9..1cc847b 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -31,7 +31,6 @@
     user: 'root'
     pass: 'onl'
     bngPort: '3'
-    oltPort: '10'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -40,7 +39,9 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    aggPort: '10'
     serial: 'EC1917000121'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
 
 onus:
   -
@@ -55,6 +56,7 @@
       dp_iface_name: 'ens10'
       container_type: null
       container_name: null
+      olt: 'EC1917000121'
       onu: 'ISKT71e82118'
       c_tag: '222'
       s_tag: '111'
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 3e48654..ab28cad 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -39,7 +39,6 @@
     user: 'root'
     pass: 'onl'
     bngPort: '31'
-    oltPort: '1'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -49,7 +48,9 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    aggPort: '1'
     serial: 'EC1904000654'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
 
 onus:
   -
@@ -67,6 +68,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1cf9d'
+      olt: 'EC1904000654'
       c_tag: '22'
       s_tag: '22'
     -
@@ -77,6 +79,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1ced5'
+      olt: 'EC1904000654'
       c_tag: '33'
       s_tag: '33'
   dst:
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index f7d9c7f..0873c15 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -39,7 +39,6 @@
     user: 'root'
     pass: 'onl'
     bngPort: '31'
-    oltPort: '1'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -49,7 +48,9 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    aggPort: '1'
     serial: 'EC1904000654'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
 
 onus:
   -
@@ -67,6 +68,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1cf9d'
+      olt: 'EC1904000654'
       c_tag: '22'
       s_tag: '99'
     -
@@ -77,6 +79,7 @@
       container_type: null
       container_name: null
       onu: 'ALPHe3d1ced5'
+      olt: 'EC1904000654'
       c_tag: '33'
       s_tag: '99'
   dst:
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 3d274d4..8f31c71 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -39,7 +39,6 @@
     user: 'root'
     pass: 'onl'
     bngPort: '31'
-    oltPort: '1'
     device_id: 'of:0000000000000001'
 
 olts:
@@ -48,7 +47,9 @@
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
+    aggPort: '1'
     serial: 'EC1721000216'
+    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
 
 onus:
   -
@@ -73,6 +74,7 @@
       container_type: 'LXC'
       container_name: 'ALPHe3d1cfde'
       onu: 'ALPHe3d1cfde'
+      olt: 'EC1721000216'
       c_tag: '112'
       s_tag: '111'
 
diff --git a/kubernetes-configs/dt-berlin-pod-multi-olt.conf b/kubernetes-configs/dt-berlin-pod-multi-olt.conf
new file mode 100755
index 0000000..9f4d6de
--- /dev/null
+++ b/kubernetes-configs/dt-berlin-pod-multi-olt.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ETXlNekUyTlRBME9Gb1hEVE13TURNeU1URTJOVEEwT0Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTW5HCkorRDArQXFrVTFxYjIxUjNCZDhlRnJZM09ZRFNPWUM0eG8vMyt4bkFYRThHZTFzK1RmVXJ4K3laSTVpSExXQlkKUUlvQzNpNmQwWlJaK1dBeEZoWW1XMFR1eDYvcFozbGJnbTk0VWEzZ1BmTGRyYjdjVms5bW4rWlJtem1KSm10Sgp0SUdsbWxLdTNJRmZBaHVnSEQyNVJWYmpIaHBRdUVEZkpCK05kU01FNDAzYThPUEJVNGZhRWRRRVB3dkpaYzB0CjlOVDdwaktNK01iMkRhZ2NGSG10K1kvT1RXNFJnNG13NWkvZ1Zyb1crc1cwWWJldW9mVFV1ejdWcFRoM3ZPRTUKdCtCaU93SjFHNFNDaU5US0xHeStGVUkwYjc1VHZnaHJDdlRlK0xTZWRJUG9mRlcvS1k0alRTamVzcWRpUW5MVQo0UHZqU0cyUFlrMG04RFYrTmhzQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHMUdQSDB0cVVCNlBNUDVhSm4zVFIzaVpYMEsKVDhGRVFDUUlWa01MTnBQM1FMSm1XejFyWUtjNGpMSnluUk5pcmZUWVFEUkVmS2k3dmVTVi9tV3lVbmJUVHpDMQptUXdnSkdzU1AzbWM2dEFPdVIrWmk1eFVUVEVTOVRUZkl4ZnN1MC9vVW5kNUY2NGFXRTVCcVgyb0NWaFRZdGRVCjB1K1JPZzN6bXBqbTdka2YwbVRENU1RazhyY1RYclBKME5BRFExcEN5Y0xJTy83VFZJUGtYL2ZKV2NxU3NzU0IKWkJDWnpXbDN1WXNRcFIzNDhOQzFxcytYWDRXTk5rMVhXYkF4RFpLNng1L2RXUS96NnBGWmdHOGQvQjZZMVdsYwpHTWtaODdkbHdtOUpFcXhsVzlYdmlBSkt4bDhzd0hNVVVaeEFXRlRDSlJzZVh1N2FGRUN0VG5rbGNGOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:37238
+  name: voltha-minimal
+contexts:
+- context:
+    cluster: voltha-minimal
+    user: kubernetes-admin
+  name: kubernetes-admin@voltha-minimal
+current-context: kubernetes-admin@voltha-minimal
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJSXZDRWU0eUNVeEl3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBek1qTXhOalV3TkRoYUZ3MHlNVEF6TWpNeE5qVXdOVEphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXhNWmxob2R4TzBCbkRXR1gKamZGeDJSUTJ5R2lhQVJNL3l5K09LSFhiOTZSVDNxeVNaYnBwd1pDanZNQU8wVnNFTCtUZ211czR5dWtCQ3RIcQpKY05NK29VZ0Q2MFU5TURFVVV5R0pFdnB1VXZxODBieGdVbngvLzkxcTg4SFBDNVM4R3JQRGxReWVkVzZFM2c2CnFoNWRmU3lQelZST2RiMnNmTTNYSjI3eXh5UjNSallDWG9ZbVo4MGttQTRFYVI0NTM5RUNHV3lSNVB4VU5QVVgKVVJuWFdhSDhJcklIUUVhMVFTMkZCV0NDSzlWN1NRUVpzYjdwcDdwaTFEUEJ1cng2MFR3UThjVG9YWnhodi9Ebwp5TUJSekhTTURBTTE1ejVrZmo5bCsyMzlyQUErUjRLRWpPd2xUbnpZZ1RQZzlMNXZ5ZkR0UWlUL0RPaWJuU0tlCmMxWUhNUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFMK0FueXkxRFJYT3I4bzZJRkdRdUlkYmYzWTV6ZVpselUvcApTTmdaQWwzSTNqcnBsTmRXeW5hZmlZdENYbzhHUlFEMCtCSmxYaG40Y09pbkhBa2xuK09jSkk0TTV0cmlLcUlUCmN4enhoZnFKcGsybWo5NTFQMGZqVjZJeXcwNU93dVhobWRhcmt2WVlmbmdVZXpNMW9pMUsyNnYvNDZPUDdkbUYKWHRUelFuU2hvenNYOXhqZURWSnl4N2cwOHRBRjlnQ0E3OTFPcGtYUE1yS1NQOWRHcHFXd1ZLRDFsL1JxbzR3TwpDTEt6Y1JObi9FVSsyeEpnSkRxeU54OStaU0NidzNLRHNsT1IzKytGODU3RnA1aWJUSlZveFYzUHBwRDRjWnd0CkdzSjBPSWZ4YUtoNDQvL3VpcS90dGhHb2hsbmlEZHF4bmIxbU5lVlVXWFRJaUtvZlRxdz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeE1abGhvZHhPMEJuRFdHWGpmRngyUlEyeUdpYUFSTS95eStPS0hYYjk2UlQzcXlTClpicHB3WkNqdk1BTzBWc0VMK1RnbXVzNHl1a0JDdEhxSmNOTStvVWdENjBVOU1ERVVVeUdKRXZwdVV2cTgwYngKZ1VueC8vOTFxODhIUEM1UzhHclBEbFF5ZWRXNkUzZzZxaDVkZlN5UHpWUk9kYjJzZk0zWEoyN3l4eVIzUmpZQwpYb1ltWjgwa21BNEVhUjQ1MzlFQ0dXeVI1UHhVTlBVWFVSblhXYUg4SXJJSFFFYTFRUzJGQldDQ0s5VjdTUVFaCnNiN3BwN3BpMURQQnVyeDYwVHdROGNUb1haeGh2L0RveU1CUnpIU01EQU0xNXo1a2ZqOWwrMjM5ckFBK1I0S0UKak93bFRuellnVFBnOUw1dnlmRHRRaVQvRE9pYm5TS2VjMVlITVFJREFRQUJBb0lCQUFhc3NCN3JFelV1VHhDTwpJZVRucnJQdFVwcGpxZTJsYUlHTTRHYVE4T0FxaThtKzBzeHVrVTNHaVRkSzBIWGJmMzNjWnAzNm9wZUhaY2luCkxDa1J3ZGV4a2svVjBDTXBNcitMTi9XZE9aVldkT2JCbmttRFo1a0dZa2hzb2xNeFF4RHlub2xlNDhOc00zNmIKa21uWTA5VCtJUGFYQ0g1SDY4VGorb3RVNFJsT0hSOGVwYytRVmV5TW8yUDB0RW1YelBBZ2JVcmVUMzN0UVBjSQpKNVUxQ1ZwSjJLNWJjMzRlWGxydkF5VHpmczRXL3hyVEw4TXZpSE12Y0xBcmJmVkVSbkZXNVl1MGlib3ltcmd5ClBJazQxRkcyUEdCbm05NUtpeHIwVFZBZ0tmSE1GbFBSSXYzTDhnVHBYUVVqWnVpLzlJWU9tQ1VBbGdYNzhTRmIKOEUrK01BRUNnWUVBM0ttUTljTnIzUGRlcnloUUdkSTY0TC9Va01jcUNCbEZTdkRDV3E0M1NrcjdlQXEzMXFnagpiSWY0NVROcTBqUnJQalhNajBkYmt2eVo3TVZ0bE5FVVJXZUlyL3hrTEZ3SkhodGwxeitCektMa1IvZVQ2MGJuCkk5M0hHUm1PYU8zRDREQXJNdHE3M0pmVjJQMGdvanJvejA5VllnMEg5VzFWRFkxRG01SXB1REVDZ1lFQTVFbUcKcDdPZFpjZ2VVSVJZTTh2M2NLQTdZd0hzbG0rZDFDVVhYNHVxb2xNSVNrS1NOOGlpMDVJOVFKWlpOcUxMcENuZQpyMWJHNE9SOUxlWERneFpQNmlTUTJCUlluNWVYRXZRQ0xLazNidC9NSTRmeEM0ZkRyKzNQY2dlWFFLNVhFZnROCnlHN3hVQm1sUjFGYk51Q29ydDliMWxhS2I3UlBJd3RCdmJTTWZ3RUNnWUFpdGRXa295SGpkMUlBa1lIUUhmNisKL2MzdEhEY2pZUDVDWkk3ZC9zdVp0eVBKWlQ0MzJPa0JtSDN4Wjk0a3hMUWQ3QTZLZHpvVGJBSzJlUFBjMWVxdgpaRExmSS8rSjdzeE1YUmp1L0FGcDlER2VsSFpES3pzT3JFTTJVb3ZSTzUxMU5YNkdHRncydmZlWWszQy90QzZNCjliakRuTE1reXhiMjg4S3Z4UlVrOFFLQmdRQ1Q5L0IyM041RnJidXdkc2Z3OHVEMHVIY2x5b1orVCtTZU1GaUIKRHJkUU5iK20ycFdKNE50aGhXVjhhcmR5eVh4emNNd3RISE1XTENQVFR4MDE1NDF1OTdxR3hGRlpTRm1jNkZwTQpkblkrd0lMQitRaE5iL2R3SGhXYkZMNStKMEs2bmdnaHhYOVdhdmtOUy9keWo1WG1tMUlja01WMGVBdmZiQmwxCmpBU1JBUUtCZ1FERDBjeGQ2a245eWF3eDhxWC8vUnFwTTNLenkva0pqODBERFQrMnBJLzFubEZ1czV6d2w4Wk8KTDkxZ0V5d3ZuY0hmNFI5SDdyZEg5SUhDL1VtSi9OWHNzK3Z0emc4QW82YWtkZWFEcWlkRHdMbmxiYWVmSlI3egpTNmluUStmRk1sMjdPTHlVSlBZZ3gxZVJrVDFaWllSUVhQQVZnYXYrYnFPVTdFdVFnNDZSNnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
new file mode 100644
index 0000000..3a898a7
--- /dev/null
+++ b/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
@@ -0,0 +1,41 @@
+# 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
+
+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"
+
+# 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-multi-olt-onos-netcfg-switch.json b/tosca-configs/voltha/dt-berlin-pod-multi-olt-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/dt-berlin-pod-multi-olt-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
+      }
+    }
+  }
+}