diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
similarity index 100%
rename from deployment-configs/dt-berlin-pod-gpon-DT.yaml
rename to deployment-configs/berlin-community-pod-1-gpon-DT.yaml
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
similarity index 100%
rename from deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
rename to deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
diff --git a/deployment-configs/dt-berlin-pod-kubespray.yaml b/deployment-configs/berlin-community-pod-1-kubespray.yaml
similarity index 100%
rename from deployment-configs/dt-berlin-pod-kubespray.yaml
rename to deployment-configs/berlin-community-pod-1-kubespray.yaml
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/berlin-community-pod-1.yaml
similarity index 100%
rename from deployment-configs/dt-berlin-pod.yaml
rename to deployment-configs/berlin-community-pod-1.yaml
diff --git a/kubernetes-configs/dt-berlin-pod-gpon-adtran.conf b/kubernetes-configs/berlin-community-pod-1-gpon-adtran.conf
similarity index 100%
rename from kubernetes-configs/dt-berlin-pod-gpon-adtran.conf
rename to kubernetes-configs/berlin-community-pod-1-gpon-adtran.conf
diff --git a/kubernetes-configs/dt-berlin-pod-gpon.conf b/kubernetes-configs/berlin-community-pod-1-gpon.conf
similarity index 100%
rename from kubernetes-configs/dt-berlin-pod-gpon.conf
rename to kubernetes-configs/berlin-community-pod-1-gpon.conf
diff --git a/kubernetes-configs/dt-berlin-pod-gpon.conf b/kubernetes-configs/berlin-community-pod-1.conf
similarity index 100%
copy from kubernetes-configs/dt-berlin-pod-gpon.conf
copy to kubernetes-configs/berlin-community-pod-1.conf
diff --git a/kubernetes-configs/dt-berlin-pod.conf b/kubernetes-configs/dt-berlin-pod.conf
deleted file mode 100755
index c1a8a7a..0000000
--- a/kubernetes-configs/dt-berlin-pod.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-apiVersion: v1
-kind: Config
-clusters:
-- name: "berlin-community-pod-1"
-  cluster:
-    server: "https://rancher.opencord.org/k8s/clusters/c-ntcbj"
-- name: "berlin-community-pod-1-node-3"
-  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"
-- name: "berlin-community-pod-1-node-2"
-  cluster:
-    server: "https://10.34.90.42:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURNeU9URTNNelExTkZvWERUTXlNRE15TmpFM016UTFORm93RWpFUU1BNEdBM\
-      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQUxPZ09NN2xKWVdjCnhoVkpFNWtJVXZOR1RoMmtIVnkxcFhDMGhTL0c3Q3A0SzI3MldoV3N2T\
-      DZUQzZCSUZZZ2FRSTZPNTNIdFQ4aTcKUUJjTDNJdG5DVzBKZy9wSzFaUm1WeWRaM0ZHMnBCRE1FN\
-      URuRzQrT25NaWN0Q2RTQjkyeFFydklzZ2hXczBRcgp3RmRMRE8zZk5pU1dWRFJnaTZwS1JWVDVVT\
-      1pzWDFVNDF1a0lKM25HQ2J6Rlk2T2did0g1NFV5bDh5VWtNMm5GCnJRUEFjTXhZZ010YkdkZlBuN\
-      EU3cVB1QkZRWkJFdTd1TmZvUWJVY21UUnkxaXN6UE5seTBzYlBKQlVYY0xQcSsKazlkSjF2UzFhc\
-      lJQYUQ2ckE0dHp0ZFdRNms4KzU0RVVFb25WV1pmZXJwSTdNODhTZk82YjRqMFozems0Q3VnRApvd\
-      kFacEVyUFNvTUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRGE2OW9JQjJXSTZMMythRHFjbjA3M\
-      FZJZFdlb1hlK3NmalYKeS9wTE5TRVdYS21oUDFtTHB0czJOaWIwUE5UTjVna1dGVlE0Tkk3YTA4Q\
-      XZFdUlFUXVPWVFPSndJK0xCZUFwbgptbVg1SkVUR3A0NGJBTlUybStVWktyblFjNnR4UTh6WC85M\
-      VcyMnhyZ2JkZ3ZrcGR1UmczZ1hiMGRyS1RXVkdlCkZmMFE2KzRaOUd6QlNOMTd4WFk3NVEzQkNWU\
-      WNIVWNDR0NuOHJvUFRoL0lEcjF6STJPNXdhM0Qvc1NVTEN2dGIKRkZDYUE2dmF4RzIyQkJKOTd5Z\
-      0JMa1BadGtnbG1vRVYvalZ5SGI2cVU5QlExWUx3ZTFxNW5PanJXaFRBbVJjUApUUmpMM1FkYWMwM\
-      lhxVEVOalFvWU0zUVdUUVZPKzg2MnNQYlhkUWtjb0drTjNkV2J4U009Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
-- name: "berlin-community-pod-1-node-1"
-  cluster:
-    server: "https://10.34.90.41: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"
-- name: "berlin-community-pod-1-node-3"
-  context:
-    user: "berlin-community-pod-1"
-    cluster: "berlin-community-pod-1-node-3"
-- name: "berlin-community-pod-1-node-2"
-  context:
-    user: "berlin-community-pod-1"
-    cluster: "berlin-community-pod-1-node-2"
-- name: "berlin-community-pod-1-node-1"
-  context:
-    user: "berlin-community-pod-1"
-    cluster: "berlin-community-pod-1-node-1"
-
-current-context: "berlin-community-pod-1"
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
similarity index 100%
rename from kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
rename to kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml
similarity index 100%
rename from kubernetes-configs/voltha/dt-berlin-pod-gpon.yml
rename to kubernetes-configs/voltha/berlin-community-pod-1-gpon.yml
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml b/kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml
similarity index 100%
rename from kubernetes-configs/voltha/dt-berlin-pod-multi-olt.yml
rename to kubernetes-configs/voltha/berlin-community-pod-1-multi-olt.yml
diff --git a/kubernetes-configs/voltha/dt-berlin-pod.yml b/kubernetes-configs/voltha/berlin-community-pod-1.yml
similarity index 100%
rename from kubernetes-configs/voltha/dt-berlin-pod.yml
rename to kubernetes-configs/voltha/berlin-community-pod-1.yml
diff --git a/tosca-configs/voltha/dt-berlin-pod-gpon-adtran-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-gpon-adtran-onos-netcfg-switch.json
similarity index 100%
rename from tosca-configs/voltha/dt-berlin-pod-gpon-adtran-onos-netcfg-switch.json
rename to tosca-configs/voltha/berlin-community-pod-1-gpon-adtran-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-gpon-onos-netcfg-switch.json
similarity index 100%
rename from tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json
rename to tosca-configs/voltha/berlin-community-pod-1-gpon-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-onos-netcfg-switch.json
similarity index 100%
copy from tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json
copy to tosca-configs/voltha/berlin-community-pod-1-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/dt-berlin-pod-openonugo-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-openonugo-onos-netcfg-switch.json
similarity index 100%
rename from tosca-configs/voltha/dt-berlin-pod-openonugo-onos-netcfg-switch.json
rename to tosca-configs/voltha/berlin-community-pod-1-openonugo-onos-netcfg-switch.json
diff --git a/tosca-configs/voltha/dt-berlin-pod-onos-netcfg-switch.json b/tosca-configs/voltha/dt-berlin-pod-onos-netcfg-switch.json
deleted file mode 100644
index 5ddbebd..0000000
--- a/tosca-configs/voltha/dt-berlin-pod-onos-netcfg-switch.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "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
-      }
-    }
-  }
-}