diff --git a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
similarity index 93%
rename from deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
rename to deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
index 954ed4a..c23b2ed 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
@@ -1,4 +1,4 @@
----
+  ---
 
   # Copyright 2020-present Open Networking Foundation
   #
@@ -22,10 +22,10 @@
   OLT_PORT: 9191
   KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
 
-# This tells the control node how to reach the Kubernetes nodes.
+  # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.34.90.40'
+      ip: '10.34.90.43'
       user: 'community'
       pass: 'admin'
     -
@@ -80,7 +80,7 @@
         pass: admin
         dp_iface_name: eth1.7
         container_type: LXC
-        container_name: voltha-client-gpon-1
+        container_name: SCOM00001c82
         onu: SCOM00001c82
         olt: EC1912001814
         c_tag: 7
@@ -95,7 +95,7 @@
         pass: admin
         dp_iface_name: eth1.7
         container_type: LXC
-        container_name: voltha-client
+        container_name: ALPHe3d1cf5c
         onu: ALPHe3d1cf5c
         olt: EC1729003539
         c_tag: 7
@@ -108,7 +108,7 @@
         pass: admin
         dp_iface_name: eth1.7
         container_type: LXC
-        container_name: voltha-client-dt
+        container_name: ALPHe3a69d03
         onu: ALPHe3a69d03
         olt: EC1729003539
         c_tag: 7
diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 95fbfc5..7e7aa2b 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -1,4 +1,4 @@
----
+  ---
 
   # Copyright 2020-present Open Networking Foundation
   #
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.34.90.40'
+      ip: '10.34.90.43'
       user: 'community'
       pass: 'admin'
     -
@@ -68,7 +68,7 @@
         pass: admin
         dp_iface_name: eth1.7
         container_type: LXC
-        container_name: voltha-client-gpon-1
+        container_name: SCOM00001c82
         onu: SCOM00001c82
         olt: EC1912001814
         c_tag: 7
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
index f161b1d..16b42fc 100644
--- a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.34.90.40'
+      ip: '10.34.90.43'
       user: 'community'
       pass: 'admin'
     -
@@ -101,7 +101,7 @@
         power_switch_port: 4
         uni_id: 1
       -
-        ip: 10.34.90.40
+        ip: 10.34.90.44
         user: community
         pass: admin
         dp_iface_name: eth1.7
diff --git a/deployment-configs/dt-berlin-pod-kubespray.yaml b/deployment-configs/dt-berlin-pod-kubespray.yaml
index fc1360c..64f9c39 100644
--- a/deployment-configs/dt-berlin-pod-kubespray.yaml
+++ b/deployment-configs/dt-berlin-pod-kubespray.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
 nodes:
   -
-    ip: '10.34.90.40'
+    ip: '10.34.90.43'
     user: 'community'
     pass: 'admin'
   -
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 7fba3ed..acf137a 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
 nodes:
   -
-    ip: '10.34.90.40'
+    ip: '10.34.90.43'
     user: 'community'
     pass: 'admin'
   -
diff --git a/kubernetes-configs/berlin-community-pod-1-multi-olt.conf b/kubernetes-configs/berlin-community-pod-1-multi-olt.conf
new file mode 100755
index 0000000..5a46870
--- /dev/null
+++ b/kubernetes-configs/berlin-community-pod-1-multi-olt.conf
@@ -0,0 +1,39 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "berlin-community-pod-1"
+  cluster:
+    server: "https://10.34.90.43:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURNeU9URTNNelExTkZvWERUTXlNRE15TmpFM016UTFORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQUxPZ09NN2xKWVdjCnhoVkpFNWtJVXZOR1RoMmtIVnkxcFhDMGhTL0c3Q3A0SzI3MldoV3N2T\
+      DZUQzZCSUZZZ2FRSTZPNTNIdFQ4aTcKUUJjTDNJdG5DVzBKZy9wSzFaUm1WeWRaM0ZHMnBCRE1FN\
+      URuRzQrT25NaWN0Q2RTQjkyeFFydklzZ2hXczBRcgp3RmRMRE8zZk5pU1dWRFJnaTZwS1JWVDVVT\
+      1pzWDFVNDF1a0lKM25HQ2J6Rlk2T2did0g1NFV5bDh5VWtNMm5GCnJRUEFjTXhZZ010YkdkZlBuN\
+      EU3cVB1QkZRWkJFdTd1TmZvUWJVY21UUnkxaXN6UE5seTBzYlBKQlVYY0xQcSsKazlkSjF2UzFhc\
+      lJQYUQ2ckE0dHp0ZFdRNms4KzU0RVVFb25WV1pmZXJwSTdNODhTZk82YjRqMFozems0Q3VnRApvd\
+      kFacEVyUFNvTUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRGE2OW9JQjJXSTZMMythRHFjbjA3M\
+      FZJZFdlb1hlK3NmalYKeS9wTE5TRVdYS21oUDFtTHB0czJOaWIwUE5UTjVna1dGVlE0Tkk3YTA4Q\
+      XZFdUlFUXVPWVFPSndJK0xCZUFwbgptbVg1SkVUR3A0NGJBTlUybStVWktyblFjNnR4UTh6WC85M\
+      VcyMnhyZ2JkZ3ZrcGR1UmczZ1hiMGRyS1RXVkdlCkZmMFE2KzRaOUd6QlNOMTd4WFk3NVEzQkNWU\
+      WNIVWNDR0NuOHJvUFRoL0lEcjF6STJPNXdhM0Qvc1NVTEN2dGIKRkZDYUE2dmF4RzIyQkJKOTd5Z\
+      0JMa1BadGtnbG1vRVYvalZ5SGI2cVU5QlExWUx3ZTFxNW5PanJXaFRBbVJjUApUUmpMM1FkYWMwM\
+      lhxVEVOalFvWU0zUVdUUVZPKzg2MnNQYlhkUWtjb0drTjNkV2J4U009Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "berlin-community-pod-1"
+  user:
+    token: "kubeconfig-user-cvpsj.c-ntcbj:kmsvcmwbdw6m9prljs9cv9cchrc5f8qmc6ddtjkvchf4cmbl84sgmj"
+
+
+contexts:
+- name: "berlin-community-pod-1"
+  context:
+    user: "berlin-community-pod-1"
+    cluster: "berlin-community-pod-1"
+
+current-context: "berlin-community-pod-1"
diff --git a/kubernetes-configs/dt-berlin-pod-multi-olt.conf b/kubernetes-configs/dt-berlin-pod-multi-olt.conf
deleted file mode 100755
index e55156d..0000000
--- a/kubernetes-configs/dt-berlin-pod-multi-olt.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01UQXpNREUyTXpBeE1sb1hEVE13TVRBeU9ERTJNekF4TWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS3FBCmhicFZ4OTg2c2oxTmE2emF5dUp0RG1vaDd4dm5XMFpBYVBxWmtyU29GdFNYT2taRUZxelF5blpQa0sxN1FkeU8KMi9JVmpqbWVsVnVsU0xBMEJIa0VNM3RBOGh1OGYxZnNab0NESUViZ2V1b0tFZmlqMTAyUmJEbjIyaE05TzZmVAp5emp5dVVNaWx4U3d3ci8xOUJXYWpDemc5WWhtRUFIdE5PWGFSWHlUV3VpSXlvTkhreWdpN0wreWdRUzJ6eGdPCkFQdVNzWkEyWXNIMkhHVjZBWDdCTm4zTnJCWkNEbjZtZlFsSXlqZzNPdmRJOWhaWHJKand5RDl1UUtyVVlYTWsKUElBZ2VUdU9IU0VMMnVhdUE5ellVYlFMekdOYlF1TlRsWXFvZmJ4eXk1Z3lhc2JwTnhUeXRQUTFJWDY5Vkc2SAorQmxXMkF1Qm00UzIrczVBVUFzQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZIMm4zc1B2WHllR0ZXSXViUFdDVkRqRVVWajNNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBS3RqVHNlYWdNSDhIWkkrUnExL1ZGdktyQXZwYTNxbFRNZDZHTmZ3VkxXZVNYNTRabQpqQXB0OGsxTE4yNzdaWCsvQmJvdFNpblF0K2VoOVVNWFEyTkt5UFRROHR5QzFXSDFzUFFrVWlsd1FVT1Q0Z3RsCmpYck9kdEZaV0lZMFJIMTg1a2VSVGoyZXFtRTJFWHFyMEhWdFMxUUVGb1RqTUtURGxadUxjUWRHY0doQllTcmEKNlpTZys3cHljUHZSSFJBM08wVXpaRXlNKzlGdkYvbmMveFpjQjVPdGkrV0RNaEE2YldVdmMrWVo5a0tZb3RlTAoyYW5zdWJjenZNdnE1eFRJNjQ1YXQ4NDluRkVyTnBWUHV4WmtzWmhIVFpFMEROM1B1dHluK0hwS0lLNkdyaHVrCmlYQlcwaktmL1JkejlnMXFiRVg5Tk1yM0ZCb1JSZ25ObHh0NgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-    server: https://10.34.90.40:6443
-  name: kubernetes
-contexts:
-- context:
-    cluster: kubernetes
-    user: kubernetes-admin
-  name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
-kind: Config
-preferences: {}
-users:
-- name: kubernetes-admin
-  user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lJWkU1d3F4UEkvZ0l3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURFd016QXhOak13TVRKYUZ3MHlNakV4TURNd09UQTJNREJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXczYVNYallvbSswTjhVSmIKWWxtM09tcWFUZkl0RklTK2RzaEdYeEhCUDl4TzRPcjYxV2VFQ0JmQTlmNGJvREtEUjBoRVI3RW9tWUdaTHZWcApMQnVyeVVJZEhBZjlUTThjL2tXTHBveFErQmRNY0ZCUHpiVEF2WFZpeUZ6T0NtRjMrSTBidFNPQ3RCSGxpRU9FCk92MjJNemZ6eVhBQ09RQ1VscnJqQjkxMXQwVWF3SEpwMm9MdTNPOVNMOEZGOTBsTUFLSllwblJya1FsR1hENFMKSStCUVVFOVE1d2t0bzdXMEU4OGtkVWpJdDYxbktKbHVVN0JtWGdGQTNCSWZWdFR6N1NtMC95b0VUR3JGKzFSZQpOd2IvdHYzakV4Q1hjcDNSZVlWTzl3M1U4eFB3VVYrUnR2MmMwdUNEa09zYThsUzBZMUQ1UzlUbDV1Z3pEZjNOCnVleTlTUUlEQVFBQm8wZ3dSakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0h3WURWUjBqQkJnd0ZvQVVmYWZldys5Zko0WVZZaTVzOVlKVU9NUlJXUGN3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFHbUJ4SmZOZGpGbGt0NW1KeG9qdWc1VWRaNnRwbnZBWjBuZFNiR0tGMFVoU0gxNWg4ZHl6Sit0CmtXOWFWUDFCZFkyYU8weUY1RVB2THlSckRwVWZlZ04vMzRBUHR1UUlHVlBpMFJwaFlKZEhBWlhDeWF1UVVlV24KYVFPVjU1cDZSZWx4SUxZZzB5WDIzdDZKTnFHNXRPeWIrNzdzNjRjMnpLSkYvaDdzUVgwYm1BMU1SMDBud1p2TwpTSjNDMGNMTStXcGRRbXlvOS9XeE1sWDVVbmNZdkFWVTJGdDZGMG9PdXZUY09sUnF4cE5BaWNyZjJjdS9rc1FwClNuaXpySWhadnp3cWZObElzSGQ2ZTJZcXl6MEdzNmlKOFBtL1hCR1h2MFo1dlZtTUJyWVBUN3NKdGhpQzBhSW8KbDYrc25DanAxOGFJZmQxMGNiL0xIZVYvYTBrRzJXOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBdzNhU1hqWW9tKzBOOFVKYllsbTNPbXFhVGZJdEZJUytkc2hHWHhIQlA5eE80T3I2CjFXZUVDQmZBOWY0Ym9ES0RSMGhFUjdFb21ZR1pMdlZwTEJ1cnlVSWRIQWY5VE04Yy9rV0xwb3hRK0JkTWNGQlAKemJUQXZYVml5RnpPQ21GMytJMGJ0U09DdEJIbGlFT0VPdjIyTXpmenlYQUNPUUNVbHJyakI5MTF0MFVhd0hKcAoyb0x1M085U0w4RkY5MGxNQUtKWXBuUnJrUWxHWEQ0U0krQlFVRTlRNXdrdG83VzBFODhrZFVqSXQ2MW5LSmx1ClU3Qm1YZ0ZBM0JJZlZ0VHo3U20wL3lvRVRHckYrMVJlTndiL3R2M2pFeENYY3AzUmVZVk85dzNVOHhQd1VWK1IKdHYyYzB1Q0RrT3NhOGxTMFkxRDVTOVRsNXVnekRmM051ZXk5U1FJREFRQUJBb0lCQVFDUXRRemhzTWpadjJPTwpGS2xoSTdoeUNCQWEyc3NqSUs5OWN3SWVTaCsrN3BSN0Vad0lOKzNZcS9WUWFRTDgwOGk3RWpaeXVTYXNsdlRZCmZobVI3UjUrRG5OTW1HR2Y1c201T2JXTTVON2cvU2E3RThveEtidHp5QjhNNVNBcE1VWEhmbmhmMzExWmdOSmsKMGs5bitRTlY0ZnViUzFCcDhSTVFrR1dhSWd1UFZNODBHN1BVd0x1bU1MTmU3ekZURmQzZ0ExS3ZqU0VUMUVwUQpFWDdYbmVUTUdDNzNVTnJBVkN4SElvUU92YVJWSGJxWEd3bVVkTTZzelRxS2prYzZRMnBVb0xtUmhKYkRjcldiClhHa29YMDd4R1BTVWFrVUtaT3VhVmtzNWF3WUtHYUQwSVB1c1IvZXVOTFNxaXo2ZUFIakE5R1hiemFJNG1tenEKdXNFbi9wVmRBb0dCQU5SNENoZDEvT2hpbUhCRFZ6VEJ4eUJqODdMOEt5ZVozcGtlZVJiaElLb0lFQW5RdUY0NgpOUFpvVk9zZGROUHV3dnBiVGw2eHVibkE5UEcraG96NlczVHRXeWhiK0tPTWhDbnM0WVhrbi9STEh1Tlp3VnNMCkRpT1hRV3hCSUJxK3VYSEF0THgxRXQzTVlLeWRhbVR3SVZqTFEvZEJoT2hPbVpRcHZ0a0tXVUZyQW9HQkFPdUMKbFpVR1FuOVBlbkVUaGtITlY5UVJqbDVRamF5cHV1TXB1eXhnaDRTc0h6NjdjQnArSDMyU2FURHVhNEdwc2hURQpuRVBGTWxFU2IzTFhucHdWSXNiNUNYMWNnWFJnajZmNXBqL0ZGSUF5LzZKcWhsd3pnWEdmUHhJV2ducXRhZzhrClR3Rng2WFYvM01iYmNZSlhpSkl3MEhLaFBPcXRvQXFoNmdvMjQwVWJBb0dCQUt3VHhHaVg0SXI5UDJTOHhXWXYKQXUwU3hvN1JlTW9MN3FLb2NYMjhPMDQ2VlhMOW5qU0NnOTZGUlRGZW0vNEJROXlzRWw3VEpnNXhYbkJqMUdsZApZckRpZzQrK1hUTm9YS252OWY4UTJSTnJ1OHA2S1FWcGdMd0docS84VnRvU1dmTHRGZlFFQlpHcE15cmFHdzlCCkJHRDd6MEh6eUlhMUVlRlRwZ1AyUTYrZEFvR0FNRlJlNy9NVjZGeGVDeUJ2bDhkVTg3OGFrVDVFcEo4OEsrdmYKYms3czRJd1Y2V0M3czZRWVFFT3dkSXNvNHJYNVJvdkdhWjNwSW52L0JQazhvbGt3QnRjS1hJQ0VUR2FZZEdjbAo5OFl3MjlJYlpiQW9uSGt4WWlqRTM2aGc1RjM3K3RsL29STklUb1dMdi84K2Z2b0ptNzZLdUV0Z1hlUjlpRkVMCjMwYStRdXNDZ1lBdGIvTk5SYVhOa3RjZ3Nza2JIN0NvOFJjakNIWXpYcHhLS0FrQW4wRURMcXlJVnlkdUxmUjkKUURYMlduamV1RHdTODR5V25aTVZ2Y3BjVGtSZXBuZU1NSFA3STg1VDhmWkd1WWxKazdVbW9tdFNjQW5QVjNJLwpzcTRTbHI5cHZLUGVXYXdKQVFmVCs2RVVFa2pJZ3RiZDVMQjNyT2NiTS81YTY5YnUrcXhDUXc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
diff --git a/tosca-configs/voltha/dt-berlin-pod-multi-olt-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-multi-olt-onos-netcfg-switch.json
similarity index 100%
rename from tosca-configs/voltha/dt-berlin-pod-multi-olt-onos-netcfg-switch.json
rename to tosca-configs/voltha/berlin-community-pod-1-multi-olt-onos-netcfg-switch.json