diff --git a/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf b/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf
index c1a8a7a..80ee24b 100755
--- a/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf
+++ b/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf
@@ -1,98 +1,18 @@
 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"
-
-
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQWFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURNeU9URTNOVGcwTWxvWERUTXlNRE15TmpFM05UZzBNbG93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQVBGNDNzMUw4R1M0CnhibFh0WFREVGRHOXFLY3hLaHRHdjYvRDk2QS9SOVdoM2V0cU8rS242ZFpoN0EwQ2Uzamp1QnVxeGxBd252b3AKQUNUcUs2V3ZuQ3lDRWd1eWQwajhUYmRoQ3ZrZ3hBekRFT1VFSHVMQUo4S1UxZUkwNm04NXFHdzRBbjlkRjNBRApyV1A5NGJPVklTbEFqYjdJcHRVZmt1WDQvQTcyeTBrTFVaR3ZxYzgxWjNMalAvbFhSMDcwRmV5MVpMQm1RWFpyCnFsQWdFS2RzVktrV2V4L0VHTllma1ozVjhLSmlFN1dQOVg5QU5CQVJKOVp4U01xMStuekcva0RlcHk4SHJiQWIKTTcyb0NESmJURDJuSWtvZ0tXQjNnbUMva0tyVThVdWJsVzVFTTFsR3IvdEdENHpkWnAvbW54YzUvL1VkSFhZaApBV1ZFQXJralI4TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQnBybVp3TldhaFUrSGVZRUNVS2k1eVRPdkc2bnpoODZVV3gKVzV3YlRxN2VrYjhrVkRncDE0elg0YW9ZWXBZOFJIbzE2V2d5RFJ2OXJsdzdrTEpnRmtJNXpiU1hFMDlrajhzTwp4SUxra0EybktRNVlXT1I1T3E2NVU5dXNhSkFpRGtQUkZsMlFhWGpyTUFMYnpQVUsxTTNIbWJ3VHM5bjh4RWoxCnd5MUc3Ui94NUdjdk1FcHNPZjhCcXlqMTJBWjIwbS8rUG9iYkpGM0NVOXYzem5HNUZienpNMWtvUGNXVkcvSUcKZHdia3cwRi9rdFNQOUN5UjE1a3FaM2JmbDJNcFJIdkFqYWg1VjhldWZPSXlrUC91KzJ3L0ZyU0NUd2JQckVuSAp3SDhmbVNkSWsrcGFmVjB1MENHZmtuYzRvcnppdzNkbGJBMWZ6NDVyRHo3ZXFIc0FPTm89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+    server: https://10.34.90.45:6443
+  name: berlin-community-pod-2
 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"
+- context:
+    cluster: berlin-community-pod-2
+    user: berlin-community-pod-2
+  name: berlin-community-pod-2
+current-context: berlin-community-pod-2
+kind: Config
+preferences: {}
+users:
+- name: berlin-community-pod-2
+  user:
+    token: kubeconfig-user-cvpsj.c-pvspc:2qt49qgjm26md74jlnckjv99kzz7prvqbfqbtrng4d2mnr5lhvrrxr