diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 7dff8e0..59648a9 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -40,6 +40,7 @@
   # Gpon OLT
     -
       ip:  10.34.90.50
+      sship:  10.34.90.50
       user: root
       pass: onl
       fortygig: False
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt.yaml
index c5c23ba..1cd1788 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt.yaml
@@ -40,6 +40,7 @@
   # Gpon OLT
     -
       ip:  10.34.90.50
+      sship:  10.34.90.50
       user: root
       pass: onl
       fortygig: False
@@ -51,6 +52,7 @@
   # XGS-PON OLT
     -
       ip: 10.34.90.51
+      sship: 10.34.90.51
       user: root
       pass: onl
       fortygig: False
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 23d66f6..2e73495 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -40,6 +40,7 @@
 # XGS-PON OLT
   -
     ip: 10.34.90.51
+    sship: 10.34.90.51
     user: root
     pass: onl
     fortygig: False
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index b0a0f99..6f29531 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -44,6 +44,7 @@
 olts:
   -
     ip: '10.192.20.206'
+    sship: '10.192.20.206'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -71,6 +72,7 @@
       s_tag: '111'
       power_switch_port: 1
       onu_type: 'alpha'
+      service_type: 'hsia'
     -
       ip: '10.192.20.46'
       user: 'cord'
@@ -84,6 +86,7 @@
       s_tag: '222'
       power_switch_port: 2
       onu_type: 'alpha'
+      service_type: 'hsia'
     -
       ip: '10.192.20.61'
       user: 'cord'
@@ -97,6 +100,7 @@
       s_tag: '333'
       power_switch_port: 1
       onu_type: ''
+      service_type: 'voip'
     -
       ip: '10.192.20.46'
       user: 'cord'
@@ -110,6 +114,51 @@
       s_tag: '333'
       power_switch_port: 2
       onu_type: ''
+      service_type: 'voip'
+    -
+      ip: '10.192.20.61'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens2f0.55'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '555'
+      power_switch_port: 1
+      onu_type: ''
+      service_type: 'vod'
+    -
+      ip: '10.192.20.46'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens2f1.55'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '555'
+      power_switch_port: 2
+      onu_type: ''
+      service_type: 'vod'
+    -
+      ip: '10.192.20.61'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens2f0.55'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '55'
+      s_tag: '550'
+      power_switch_port: 1
+      onu_type: ''
+      mcast_rg: '10.8.11.3/24'
+      mcast_grp_subnet_mask: '224.0.0.0/4'
+      service_type: 'mcast'
   dst:
     -
       ip: null
@@ -157,6 +206,42 @@
       dp_iface_gateway: null
       container_type: null
       container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.192.20.47'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens3d1
+      dp_iface_ip_qinq: '10.8.12.100'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.8.12.100'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      bng_ip: '10.192.20.47'
+      bng_user: cord
+      bng_pass: cord
+      dp_iface_name: null
+      dp_iface_ip_qinq: '225.22.0.2'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
 web_power_switch:
   ip: '10.192.20.56'
   user: 'admin'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 1d254e9..ef88dad 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -44,6 +44,7 @@
 olts:
   -
     ip: '10.192.20.206'
+    sship: '10.192.20.206'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index a5d9eae..98e8139 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -16,7 +16,7 @@
 
 ---
 
-kube_config: 'infosys.conf'
+kube_config: 'infosys-pod.conf'
 
 nodes:
   -
@@ -36,13 +36,14 @@
 olts:
   -
     ip: '192.168.10.75'
+    sship: '192.168.10.75'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
     aggPort: '10'
     serial: 'EC1917000123'
-    oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
-    oltDebVersion23: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
+    oltDebVersion: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb 
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb 
 
 onus:
   -
@@ -69,7 +70,7 @@
       user: null
       pass: null
       dp_iface_name: null
-      noroot_ip: '192.168.20.254' 
+      noroot_ip: '192.168.10.24' 
       noroot_user: volthadhcp
       noroot_pass: volthadhcp 
       dp_iface_name: ens10
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index b04bc4c..080a801 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -44,7 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.100.90'
+    ip: '10.111.0.3'
+    sship: '10.128.99.90'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
new file mode 100644
index 0000000..38cb23d
--- /dev/null
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -0,0 +1,133 @@
+---
+
+  # 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.
+
+  kube_config: '/var/k8.conf'
+
+  # This tells the control node how to reach the Kubernetes nodes.
+  nodes:
+    -
+      ip: '10.128.100.70'
+      user: 'cord'
+      pass: 'cord'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+    -
+      ip: '10.128.100.72'
+      user: 'cord'
+      pass: 'cord'
+
+  fabric_switches:
+    -
+      mac: 'cc:37:ab:61:80:ca'
+      ip: '10.128.100.80'
+      user: 'root'
+      pass: 'onl'
+      bngPort: '31'
+      device_id: 'of:0000000000000001'
+
+  olts:
+  # Gpon OLT
+    -
+      ip:  10.90.0.115
+      sship:  10.90.0.115
+      user: root
+      pass: onl
+      fortygig: True
+      aggPort: 9
+      serial: EC1912001818
+      oltDebVersion: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+      oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+
+  hosts:
+    src:
+      #GPON ONU
+      -
+        ip: 10.90.0.51
+        user: ubuntu
+        pass: null
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: SCOM00001ca7
+        onu: SCOM00001ca7
+        olt: EC1912001818
+        c_tag: 7
+        s_tag: 31
+      -
+        ip: 10.90.0.51
+        user: ubuntu
+        pass: null
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: SCOM00001c8d
+        onu: SCOM00001c8d
+        olt: EC1912001818
+        c_tag: 7
+        s_tag: 32
+      -
+        ip: 10.90.0.51
+        user: ubuntu
+        pass: null
+        dp_iface_name: eth1.7
+        container_type: LXC
+        container_name: SCOM00001c7f
+        onu: SCOM00001c7f
+        olt: EC1912001818
+        c_tag: 7
+        s_tag: 33
+
+    dst:
+      -
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: '10.128.100.70'
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0f0
+        dp_iface_ip_qinq: '10.31.7.254'
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: '10.128.100.70'
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0f0
+        dp_iface_ip_qinq: '10.32.7.254'
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+      -
+        ip: null
+        user: null
+        pass: null
+        noroot_ip: '10.128.100.70'
+        noroot_user: cord
+        noroot_pass: cord
+        dp_iface_name: enp3s0f0
+        dp_iface_ip_qinq: '10.33.7.254'
+        dp_iface_ip: null
+        dp_iface_gateway: null
+        container_type: null
+        container_name: null
+
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 43da68f..a4f8881 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -44,7 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.100.90'
+    ip: '10.111.0.3'
+    sship: '10.128.99.90'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index be10767..17a2bbd 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -36,6 +36,7 @@
   -
     name: 'edgecore'
     ip: '192.168.100.112'
+    sship: '192.168.100.112'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index f28ce08..a650f10 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -34,6 +34,7 @@
 olts:
   -
     ip: 192.168.2.22
+    sship: 192.168.2.22
     user: root
     pass: onl
     fortygig: True
diff --git a/kubernetes-configs/dt-berlin-pod-gpon.conf b/kubernetes-configs/dt-berlin-pod-gpon.conf
index e230f99..ed06ff9 100755
--- a/kubernetes-configs/dt-berlin-pod-gpon.conf
+++ b/kubernetes-configs/dt-berlin-pod-gpon.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EY3hNekV5TURReU1Wb1hEVE13TURjeE1URXlNRFF5TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTdlCnE0RHdIS1g4NDRYaGtDS0hSai93bXNmSWxHWDFoVFh2b1Jtd1BtL3JCUFRuSVpIdEd6Y2F6a1l1eFdzR2YwcXUKMnJ4dGtmSXVLWkNHM3pKbVlvTE9saFJLQU9zVTJGOUNlSUJjTU03N21GTktZV0FSbk1LaE5vZmN1TG5aWXM0ZApHZzg2Nmo3WTFVUXFrRExJaXdFMi9zeUlKS0ErR1NhLytjK3FVVEJNUjd2dFJueXlwWExKV0tBbVVla1cyY2ZVCmF0bDljSGtrMWJ2NXlONmtwZHZzL1dLV21MYy80aldPb3dxV1ZRd0xwTFRZTnJkZXZhRkhpTHgvZFdWdkg1eEoKVG5VYzVCUUpaQXlWOG9za1ZjMG4wbTdyRlA4d0o0Skd0QTJWVWFOS3JxWmM0TlNDMVRicVRkVGZ5QjBjQ0x4SAppT2RBa2xvYzBKQ3dnd1J1Wm84Q0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJeG1NVHNWM1hGRzhSSDNJZTFRcVhqMXp3dG0KMkJjTzRVZDVlcE82OFowcGt1amExZ3MvTGt3MjJzUFAxWDhicE1pL09oUUtBK0xPUndyWVpBbENUM0R0OVI3aApUbGFLdTRabmUzaGRSbWRMVlpnaEJ0RElQcGdiK2NlTjFnK3lwb1dpYnZORDJYdCs1aitRZ01OeS9Dc0dtWkZYCjhlWFBZa3F4Y3JnV3lnRlhDMC9DckcxVG16bTVTc21Fc3hiOEFGS1BCRVdNTEtNZHhTYnVCU0NLbEltZDZiQXUKNmZWR2lTWVFGemFtRURtbndZNURwbWdpZGVGM3RUZDUwamNtSEs1UkpNRDlJSkNTK0MydEVmazQwNHZPY2E1TwpTV3Bqb0NXbWRZa2ZyNVBJa2JsQmVEMTBVOU5sSVlBa2RONEtWM3hqbitOSzZLbk4zMlhRbEF3ald3RT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:40563
-  name: voltha-minimal
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EZ3dOVEE1TXpJME1sb1hEVE13TURnd016QTVNekkwTWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTVGClFubFMyQzJEdTJxeEg3VE9kUHZHakJiLzhOTEtXMDJIeC9rYjFBMUJxUG91aUJ1T0lIRHhVMTlOZGE5ejV1MEkKNzBNNmlzVVd0ZE9ZK0tGZEhheHFnajU5V3RGNk1CWjJnbk1iNWkwVXRTaHk2S0dNTHBkUXpQYlRabjJRVjY5WAptVzZJOFdXK0RQVG1GTWh2YnlYYU0xWC9XWWhyK0w1SGg0M1pyS3pJRm5NYlNFWkdzb2RWbmVRMExwQStUZkJIClkwNENqdEFEaXlUREJiRkVoUjNyWVlMTnJ6RFdwdktVY3gzSkVPTjU1VkNiYzFWQXNtMkFxcGFHMjJIUVVnZjQKZ2FLN1FEZVZlekZvenlqV3FOV0tPQkxRc2lEMEdXaCtlQ3gwV05wWURHa3JyVzAxaFhyRWZkZ0Y1SDdaYStSLwpGUU11NWxUb3Z4MDIwZzJNN1JrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFEbW9qVkdXdnYrZFZSZW5laWtoemhZemJoOGUKRjY1QVM1TUFGWFZWMjVrV2NvV1ZxTk5uNmdYY0d0aHpLVDNJSjVtTDhpM0dQbWdqd3BmQWJCNHQ1QkJBK1IyNwpWTGRaWGprb2NkdDBmcmoxOFdjZUw4UTdvWFA0eS9VamUwOTkydmNTclRnbG1pRjNGcitTNzdwOUp3a25ZNEdwCmZnTW9LNm5jUWkwVVpadFJ4bUoyWEpXMndabzkxbFR2Y2JZZzgxYlI0MUt0a3JpRUtDYlArTEdWSlJMc2h2SjMKWHVBSndkUElpalhxOGhXREhRTWlGSzVpN0FJRmV1MmtiQUtaSkZ1YlUrS095cWljUDhGL0wvSW5zYlBEVHZySwp1STdXZ3JERHpzU3IzQi9oSjhwSWVLMk5Gc3pYMEdlZWlJbTZMZ0xQWW9rSlVMZ1JSV2JYVXIzNnBDTT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:41011
+  name: kind-voltha-minimal
 contexts:
 - context:
-    cluster: voltha-minimal
-    user: kubernetes-admin
-  name: kubernetes-admin@voltha-minimal
-current-context: kubernetes-admin@voltha-minimal
+    cluster: kind-voltha-minimal
+    user: kind-voltha-minimal
+  name: kind-voltha-minimal
+current-context: kind-voltha-minimal
 kind: Config
 preferences: {}
 users:
-- name: kubernetes-admin
+- name: kind-voltha-minimal
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJQ0ljK096cndNaTR3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBM01UTXhNakEwTWpGYUZ3MHlNVEEzTVRNeE1qQTBNamRhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTEycmJNTXZ0R1J5Wm5zcGIKNlYzeE1DOXBpZEJTZTRPMC9jcHpGYmd3SlhKY3kzQjZvK3QrdzVkZitTc3FCL3JuZzZ6MTJyMVYxWGNBNGNLSApXaVNvTXNmMTVqRE1teEZtL1J2MUNjc3c1VFF0emlRdmo4RW9tVWlKTmRYTnJnSDVZZnNaWi9OVkdKRDRQcld0CjFaSHArS2tra1VkU09zcUY1YWpaV0pSYVQyVC9vWkY2SW5yd2NQcDRIMFRCZXE5bjI0R3FORVFVTWcxK25uSXgKZ3VncVJaSVlndmVmay8wTkRGMGZYSVFqbTlKUUh2Rkpydm1tZDVEY2loN2srWWllTk9HbjU0L01RM1hNL2k5YgpuSFI3ZXdxYjZFc0l6TmNUWDlPUEtZNzJOZlhOU0NBSzk4dVNvejlKMGxaaWlIRk5kUlk2NDR6RGY2aWQwTjVVCmZpOExDd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFbU9wbUU0V2o2S24vQlIwL2JyS1RJYU9HbUl5cERBeU5WbgpiVTNBSUlranBqRTBsaFFXcnVEeTRjZ25PelNSVFFHVjQ3R0FvbllTbHo1N3pnNjRmblJtN0xiejNnMTVXR2NsCnlkZkU3NHhGRVpncG1xaWtiS1JTMWdDSkU4czdKOEVjMi9JK1pJM0NxV01GWENvcEVteUFUcndnQ0FSNEo5djgKQW5oWG55TkZzNm1TUDc4SnF1RVlOZ2pYbEN6ejF3cnpMU3ZSUFJPUEV3TjdpVGNzTVREcTVNK1paTndJcngwbAoxeXVMQzRpdjgwNGsxdDJMKzFSWDB2SmRsWG5HTTNvNEYxRnZrR3BNR2NoVFZzU1MyVnN1S2VTdndvc0R3dHVFClo0SWZHc1pLYjh0RUNhM3hFWnJiM0ZBNnBDR1hXd01lOS96enRhbHN3cGJBR2gyeGt4RT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBMTJyYk1NdnRHUnlabnNwYjZWM3hNQzlwaWRCU2U0TzAvY3B6RmJnd0pYSmN5M0I2Cm8rdCt3NWRmK1NzcUIvcm5nNnoxMnIxVjFYY0E0Y0tIV2lTb01zZjE1akRNbXhGbS9SdjFDY3N3NVRRdHppUXYKajhFb21VaUpOZFhOcmdINVlmc1paL05WR0pENFByV3QxWkhwK0tra2tVZFNPc3FGNWFqWldKUmFUMlQvb1pGNgpJbnJ3Y1BwNEgwVEJlcTluMjRHcU5FUVVNZzErbm5JeGd1Z3FSWklZZ3ZlZmsvME5ERjBmWElRam05SlFIdkZKCnJ2bW1kNURjaWg3aytZaWVOT0duNTQvTVEzWE0vaTlibkhSN2V3cWI2RXNJek5jVFg5T1BLWTcyTmZYTlNDQUsKOTh1U296OUowbFppaUhGTmRSWTY0NHpEZjZpZDBONVVmaThMQ3dJREFRQUJBb0lCQUd5Q1V1NzlpZTBBVHhHQgpkVkxVRTAzbVZBOHJkS0RxOHh4MEFneUt2eFhkeVloZ25DWTkxWmpJZzN1TGxweDJjbkFOaTdvbmJUa2R2TC83CnNScGpKS2FQdXZtODB4TzViRnRLM2QrVkRvZ21CSHkyRlk4Z0NVZE5GbkNieGdORTAwM2JvaXlPa2VyUiszbjcKSWhsV2FyanEycFNqakhRNDE4R2JqLy9pbXFzcWxDN0kxaUZEMEYwMk1tQ3pwQ3hKUVNTTkFlbGQzTFZaNkRhUAoxeHpwaWorT3hpSWxSSFlOaE56d0ZXOFd5TG9EVXJKOHNORy9yQ3BLSG1BeFRrRmhjcm15OHE5TE9UUG5uNGZECmx3UWNDazRLWmVtR1o0eTdXcno5M01MbzZqbDNOYldsSkk1d3ZNcDB0b1JVZlpvV2ZyYWY2NmFKVHVTZ0FGUUcKZlFZU01rRUNnWUVBNHFsVE1zTVorTGFzaG5valozcmZqcFFJa1lpLzJMR21yY2NSL2psNlhleWVvaXJFeUExWQp0eTZmREg5SS9UcXFwZzJWeUR5QVF5Z29tVkdIbUtmWnNtWmoxMzdWbHRtaDI5NjlYUGNWNVdCb2I4bUMrVWxrCjQ1QWVrWWpCTE95YWsrTmhwa0dzaHpmNURUODh0R2VyeTNmK3RWZGhQNXB0U0NXdVkyOTZIcE1DZ1lFQTgwenkKeFhySTFuZW4zd3JMZytBaFl2MWFGdG83b2I4U0h5a2tPa0toYzVBQWVpY1pvbDFYRzBDUHpsR00rc0sxbWhRMwpSK05SUytnWW9hL2toRG05S0hTVjJkSk5KRlFqb2xiYUlwRitYTFBrblk2eUZ6NXY3UzRIKytxRjZBbjVMZkRkCmxOc3QwTXlocEdNZkgrTERoQzZydm5MSit2WmsxS2tPWHZRWk5La0NnWUJqbE5MWnRYL2VscHM3eGNOeVBqaWoKMG9QbE5MaGN3c2doQnhudm9GOFRqdGF2RnEwMzJ5MUQ1YmE0N2Q4cWFqRDVIWFRWOFViRXVvc0R1Ujhpd1hQUwpma3VWTE1NNE1FdDladUc1UzFFU1lvWGZ2eC9NMkNMOEc2QmlmanVvdWhhN3JLV0ZQc3RHNlIrQlkyd1BNcEQyCnByU0FCWERUV2N4emF5S3Z5eFZUQXdLQmdFQnhubEJlZ0hvR1FhbmJneUtRS0dlKzhiRGg1eStsbTVnelhvd3IKLy9YTEs4VXZQQ1A4azBqOXBkbWhValZOZzZxbk5pbE5kY2drVnZua3pDT1Y0NXVtbmRhUFZLMk50ODZWTUx3OQpTM29ra0NhSG1IWjlyRW5uaW1mWXE5VlZadkliUGFYakZGU2REeWVxdGFETmdMb3ZYb0JZaVZWM0ZDZ2NDMWx0ClVJdlpBb0dCQUlxMi9LZ1J4cTFTRFhjVFhoZjlpRmI2RE5oNzQ1OThEZm5COStSNmprbS9vNWxaUUVERGtpUk0KZUV1SFZjcVVoeVRpZXlhRzdKWXdqdkg5N3hpTERXSGZaYlVPYkQrOEZSVFhzWnYvUTVnQXZqMjJZcFN1U0hRYgpOd09tbXVjK2t5N0JYdG9yWkxJNW11TzJtczgxSU94a05RVXpCSHl0TzhMNDhGK3lLWUV5Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJU0FnV1ZjTWlOcTh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBNE1EVXdPVE15TkRKYUZ3MHlNVEE0TURVd09UTXlORFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXlMNDhDY2p2Z2VSQ2JGNEkKUUxEU0FQdk9MOThKL2VvNkdSbFcvYlo2cUNzbVZKcTgrQWdvdmpMSHUxbElReVJPbHJBeUFTeWMwbmMySndLRgpLN2pONElqWDNSVTlER3F1bFRYL0hXTW9NK3RLdTk3cGVRWG9FR0FLaWlZSG1EL01DY0IyUG4zc3l3TWFyU0xqCnY0QlZ6c2xqaWN3SDZobExhcmNWQ3RUV2gxbUlJZ2RvdU8vei9zaFlUNzVBM1FRWHpWTzg5T3pFS25NSENPVzEKeTl5cHJBMjN3ZVl2K2lSdVQ5V3MvUmsrQjB6UXRlWEZBWlp3aUFNMkpsNkRVZno1aE53TTdraW9BRzdoYmU0RAphK085aHI4eHBwbDFId1RzTUU5bFRWZE0zMmVaOFJxbXNpcUFBYkVwUnlSRVJnT2xHa1ZrU2FNL1prVUdtY2h4ClB6ZG81UUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNVHVjWUNadHlNTTZ0ejM0dmNPdEljbEVRcVRRS0YrY3pTNwpMVXg0Um85c2hvVW9wV2hNdVV6VDZidG9WT010MzJGUzY3cEw0MUI2eGlwVGlyZWRCOXJPU0Z6ZThFU2psdFo0Cms4Z3ZCY0FDVE93V3hidDVHekhMUlpEOXA4SjZRajlVelQ3ZVB3QUNCZURIMjRWV3lKaktxalBKZWJzNUpaVUUKa1hZVGxaUi8rVzBYYkxBRjE2RkpPMlk2RERRaThaR3ZmK1h6djFoSkpHSXpsNS94azF4Tk1PV0V6M1dlZVNwUwpqOHBTaHlzclVVTWpRcEhsZnZSWTJXZ0FRcndmMFhCbUFMRDNGUktDRkxzbmw3dTY0QXhVVERsMTMvM1pGckpJCmJsS2hVWnhzNFdrL2RoYmRlOGRTVFY4N0Vsa29WaFA2c2YwYUJtR0tGbkhpeTJKNkJJWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeUw0OENjanZnZVJDYkY0SVFMRFNBUHZPTDk4Si9lbzZHUmxXL2JaNnFDc21WSnE4CitBZ292akxIdTFsSVF5Uk9sckF5QVN5YzBuYzJKd0tGSzdqTjRJalgzUlU5REdxdWxUWC9IV01vTSt0S3U5N3AKZVFYb0VHQUtpaVlIbUQvTUNjQjJQbjNzeXdNYXJTTGp2NEJWenNsamljd0g2aGxMYXJjVkN0VFdoMW1JSWdkbwp1Ty96L3NoWVQ3NUEzUVFYelZPODlPekVLbk1IQ09XMXk5eXByQTIzd2VZditpUnVUOVdzL1JrK0IwelF0ZVhGCkFaWndpQU0ySmw2RFVmejVoTndNN2tpb0FHN2hiZTREYStPOWhyOHhwcGwxSHdUc01FOWxUVmRNMzJlWjhScW0Kc2lxQUFiRXBSeVJFUmdPbEdrVmtTYU0vWmtVR21jaHhQemRvNVFJREFRQUJBb0lCQUhBRm1NTnRHaHJHSWpzUApEbFByV0lXci94ZS93M2VxcWRrdnh0ZTJhU1JIVUJDT2VUMkFjQndUZ2xvT0xNRXJGYUFKbXg0RW8wN2ZyNXg5ClQ0dGlpYUR2UEdiblh6WDZvb29wbzcvbWdaelhoTkRxU0NkOUlFOWpDUDZtMGo0bis5akZTamI5VnBMRG5MTloKY1BhQXkyR21DS0h3OWNteGErQ1ZZbXkwOFRKOXliaGU3WnU5V0lxNVdxeVZENXV3NmVaRWF4SHZSN2l2UDgzUwpqclFucXpCMmlJbnh3T1Zxa2NwOEU0OTFiWXZITmcxQkUyNjg4ZVpZUXJmZVRVM2hTY2Rxd0ZUQ1d2V0F5R2gwCkx3S3hDRlp4b3M4VHdjZGlCOWR4MWRnQ0pPU0V5Q0ZPOG5ESkhXMnlnbE5STzcrZGxhdTVySHJxYVZ3cXhreloKeGtLZVNRRUNnWUVBelduK3BxdmxCcyt3YVlvMHZqZ1BPVHY0Ym9qNitrTlVPa1pEaUZTMmNZV21qTml5V3RjdgpVNlptZ0hhZmovOWE0Tk5Ga2tCRlJTaVNadHpEWWZtWFJGVGVmNGRRSmJRVjQ4VHEzMzdWMEgvT05BK3Y0c1dhClpCYnJuRXFWZnBjajRjMkhOSys0MjlrUno4VTErb0RXN2lhemw0M3V6RWpwTWRicDlHVU9ESFVDZ1lFQStpM0UKa0xKeGc5STBwb1RxZjkzODdCRy9GbURJd2ZxcjFJbGl5R3lNZ1o2MGZ0S0J2RWRjVU9ycGhJZjYrWW1UNXRhUQpadFhzRHZ4NW4wUnlhU0tKTnE0MWNQVkdFZHBjK3o1Ym1ENTZFU1owZnVvYjc5aUpGYWVXZTc5QURLeTNHZGZDCmRWZm0xUGhoTU1GaGcwMnB4NW9ka25aR0VzNWUrayt0cWFZVUhMRUNnWUFoYjl1UDdmTStCSmpHMVVSNG9rOTQKRlpiL0J6VXpmN282TWkzVUIxWWJiSklMNDBwRkZ6b1E5OGsvcUErWk5RdnFCUG9TTUh3V0llQ1M5ZVNvRWlUWgpicWM1UXlGOHdhKytmOU5yeGcydi90M21BNWV4NWxDWGNsT3dBVVFNY3pYWUQ4aXVmdHdzalUwazhRazBXYnlpCno1SDBYWm85anJERytDRGxNMzN4OFFLQmdFNlloRkZsRGc1NHdudXg5QzNab3JUVFduSUFVL0hFKzZpWXhNVHMKZlRQWGxTTG1wVVZ1TWMxbUQ1aklVNHVEc2tocURoR1FrVW1mL2VHUVVsVS9PVlpKWXBhcko2bENMY1hzc0QvagpHTnc4ZFlyTnA1c3hMdGZ6djIzL0JuTTA2NDBkNElTVzZmanNVelJLL0lTUXFJOEJsdHJGZDN3L0EwMm1MSXZJCmxqYnhBb0dBZHFDeWRxbklqQW51a3VEWXFxalBSVDFvUzEvVG42NHpDcE5JYzZOMzVhZTZiTG5KcGw3bmM2VzQKSGhKSEhSa0ZFYnFYTisxVHQ5a2ZZYW9xRjdXTTZmVE1DNjVXNUNhSjBrSGpqamZuenlITmtQZFRLalRMRDZqYQpQSFdyMUlDMmNmazE4cDlhcFVmUkgyOVhUR0Jrdisxb0ltVFFqbmt2YTV0TkU3WGZxYUE9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
diff --git a/kubernetes-configs/dt-berlin-pod-multi-olt.conf b/kubernetes-configs/dt-berlin-pod-multi-olt.conf
index 9f4d6de..ed06ff9 100755
--- a/kubernetes-configs/dt-berlin-pod-multi-olt.conf
+++ b/kubernetes-configs/dt-berlin-pod-multi-olt.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ETXlNekUyTlRBME9Gb1hEVE13TURNeU1URTJOVEEwT0Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTW5HCkorRDArQXFrVTFxYjIxUjNCZDhlRnJZM09ZRFNPWUM0eG8vMyt4bkFYRThHZTFzK1RmVXJ4K3laSTVpSExXQlkKUUlvQzNpNmQwWlJaK1dBeEZoWW1XMFR1eDYvcFozbGJnbTk0VWEzZ1BmTGRyYjdjVms5bW4rWlJtem1KSm10Sgp0SUdsbWxLdTNJRmZBaHVnSEQyNVJWYmpIaHBRdUVEZkpCK05kU01FNDAzYThPUEJVNGZhRWRRRVB3dkpaYzB0CjlOVDdwaktNK01iMkRhZ2NGSG10K1kvT1RXNFJnNG13NWkvZ1Zyb1crc1cwWWJldW9mVFV1ejdWcFRoM3ZPRTUKdCtCaU93SjFHNFNDaU5US0xHeStGVUkwYjc1VHZnaHJDdlRlK0xTZWRJUG9mRlcvS1k0alRTamVzcWRpUW5MVQo0UHZqU0cyUFlrMG04RFYrTmhzQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHMUdQSDB0cVVCNlBNUDVhSm4zVFIzaVpYMEsKVDhGRVFDUUlWa01MTnBQM1FMSm1XejFyWUtjNGpMSnluUk5pcmZUWVFEUkVmS2k3dmVTVi9tV3lVbmJUVHpDMQptUXdnSkdzU1AzbWM2dEFPdVIrWmk1eFVUVEVTOVRUZkl4ZnN1MC9vVW5kNUY2NGFXRTVCcVgyb0NWaFRZdGRVCjB1K1JPZzN6bXBqbTdka2YwbVRENU1RazhyY1RYclBKME5BRFExcEN5Y0xJTy83VFZJUGtYL2ZKV2NxU3NzU0IKWkJDWnpXbDN1WXNRcFIzNDhOQzFxcytYWDRXTk5rMVhXYkF4RFpLNng1L2RXUS96NnBGWmdHOGQvQjZZMVdsYwpHTWtaODdkbHdtOUpFcXhsVzlYdmlBSkt4bDhzd0hNVVVaeEFXRlRDSlJzZVh1N2FGRUN0VG5rbGNGOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:37238
-  name: voltha-minimal
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EZ3dOVEE1TXpJME1sb1hEVE13TURnd016QTVNekkwTWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTVGClFubFMyQzJEdTJxeEg3VE9kUHZHakJiLzhOTEtXMDJIeC9rYjFBMUJxUG91aUJ1T0lIRHhVMTlOZGE5ejV1MEkKNzBNNmlzVVd0ZE9ZK0tGZEhheHFnajU5V3RGNk1CWjJnbk1iNWkwVXRTaHk2S0dNTHBkUXpQYlRabjJRVjY5WAptVzZJOFdXK0RQVG1GTWh2YnlYYU0xWC9XWWhyK0w1SGg0M1pyS3pJRm5NYlNFWkdzb2RWbmVRMExwQStUZkJIClkwNENqdEFEaXlUREJiRkVoUjNyWVlMTnJ6RFdwdktVY3gzSkVPTjU1VkNiYzFWQXNtMkFxcGFHMjJIUVVnZjQKZ2FLN1FEZVZlekZvenlqV3FOV0tPQkxRc2lEMEdXaCtlQ3gwV05wWURHa3JyVzAxaFhyRWZkZ0Y1SDdaYStSLwpGUU11NWxUb3Z4MDIwZzJNN1JrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFEbW9qVkdXdnYrZFZSZW5laWtoemhZemJoOGUKRjY1QVM1TUFGWFZWMjVrV2NvV1ZxTk5uNmdYY0d0aHpLVDNJSjVtTDhpM0dQbWdqd3BmQWJCNHQ1QkJBK1IyNwpWTGRaWGprb2NkdDBmcmoxOFdjZUw4UTdvWFA0eS9VamUwOTkydmNTclRnbG1pRjNGcitTNzdwOUp3a25ZNEdwCmZnTW9LNm5jUWkwVVpadFJ4bUoyWEpXMndabzkxbFR2Y2JZZzgxYlI0MUt0a3JpRUtDYlArTEdWSlJMc2h2SjMKWHVBSndkUElpalhxOGhXREhRTWlGSzVpN0FJRmV1MmtiQUtaSkZ1YlUrS095cWljUDhGL0wvSW5zYlBEVHZySwp1STdXZ3JERHpzU3IzQi9oSjhwSWVLMk5Gc3pYMEdlZWlJbTZMZ0xQWW9rSlVMZ1JSV2JYVXIzNnBDTT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:41011
+  name: kind-voltha-minimal
 contexts:
 - context:
-    cluster: voltha-minimal
-    user: kubernetes-admin
-  name: kubernetes-admin@voltha-minimal
-current-context: kubernetes-admin@voltha-minimal
+    cluster: kind-voltha-minimal
+    user: kind-voltha-minimal
+  name: kind-voltha-minimal
+current-context: kind-voltha-minimal
 kind: Config
 preferences: {}
 users:
-- name: kubernetes-admin
+- name: kind-voltha-minimal
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJSXZDRWU0eUNVeEl3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBek1qTXhOalV3TkRoYUZ3MHlNVEF6TWpNeE5qVXdOVEphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXhNWmxob2R4TzBCbkRXR1gKamZGeDJSUTJ5R2lhQVJNL3l5K09LSFhiOTZSVDNxeVNaYnBwd1pDanZNQU8wVnNFTCtUZ211czR5dWtCQ3RIcQpKY05NK29VZ0Q2MFU5TURFVVV5R0pFdnB1VXZxODBieGdVbngvLzkxcTg4SFBDNVM4R3JQRGxReWVkVzZFM2c2CnFoNWRmU3lQelZST2RiMnNmTTNYSjI3eXh5UjNSallDWG9ZbVo4MGttQTRFYVI0NTM5RUNHV3lSNVB4VU5QVVgKVVJuWFdhSDhJcklIUUVhMVFTMkZCV0NDSzlWN1NRUVpzYjdwcDdwaTFEUEJ1cng2MFR3UThjVG9YWnhodi9Ebwp5TUJSekhTTURBTTE1ejVrZmo5bCsyMzlyQUErUjRLRWpPd2xUbnpZZ1RQZzlMNXZ5ZkR0UWlUL0RPaWJuU0tlCmMxWUhNUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFMK0FueXkxRFJYT3I4bzZJRkdRdUlkYmYzWTV6ZVpselUvcApTTmdaQWwzSTNqcnBsTmRXeW5hZmlZdENYbzhHUlFEMCtCSmxYaG40Y09pbkhBa2xuK09jSkk0TTV0cmlLcUlUCmN4enhoZnFKcGsybWo5NTFQMGZqVjZJeXcwNU93dVhobWRhcmt2WVlmbmdVZXpNMW9pMUsyNnYvNDZPUDdkbUYKWHRUelFuU2hvenNYOXhqZURWSnl4N2cwOHRBRjlnQ0E3OTFPcGtYUE1yS1NQOWRHcHFXd1ZLRDFsL1JxbzR3TwpDTEt6Y1JObi9FVSsyeEpnSkRxeU54OStaU0NidzNLRHNsT1IzKytGODU3RnA1aWJUSlZveFYzUHBwRDRjWnd0CkdzSjBPSWZ4YUtoNDQvL3VpcS90dGhHb2hsbmlEZHF4bmIxbU5lVlVXWFRJaUtvZlRxdz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeE1abGhvZHhPMEJuRFdHWGpmRngyUlEyeUdpYUFSTS95eStPS0hYYjk2UlQzcXlTClpicHB3WkNqdk1BTzBWc0VMK1RnbXVzNHl1a0JDdEhxSmNOTStvVWdENjBVOU1ERVVVeUdKRXZwdVV2cTgwYngKZ1VueC8vOTFxODhIUEM1UzhHclBEbFF5ZWRXNkUzZzZxaDVkZlN5UHpWUk9kYjJzZk0zWEoyN3l4eVIzUmpZQwpYb1ltWjgwa21BNEVhUjQ1MzlFQ0dXeVI1UHhVTlBVWFVSblhXYUg4SXJJSFFFYTFRUzJGQldDQ0s5VjdTUVFaCnNiN3BwN3BpMURQQnVyeDYwVHdROGNUb1haeGh2L0RveU1CUnpIU01EQU0xNXo1a2ZqOWwrMjM5ckFBK1I0S0UKak93bFRuellnVFBnOUw1dnlmRHRRaVQvRE9pYm5TS2VjMVlITVFJREFRQUJBb0lCQUFhc3NCN3JFelV1VHhDTwpJZVRucnJQdFVwcGpxZTJsYUlHTTRHYVE4T0FxaThtKzBzeHVrVTNHaVRkSzBIWGJmMzNjWnAzNm9wZUhaY2luCkxDa1J3ZGV4a2svVjBDTXBNcitMTi9XZE9aVldkT2JCbmttRFo1a0dZa2hzb2xNeFF4RHlub2xlNDhOc00zNmIKa21uWTA5VCtJUGFYQ0g1SDY4VGorb3RVNFJsT0hSOGVwYytRVmV5TW8yUDB0RW1YelBBZ2JVcmVUMzN0UVBjSQpKNVUxQ1ZwSjJLNWJjMzRlWGxydkF5VHpmczRXL3hyVEw4TXZpSE12Y0xBcmJmVkVSbkZXNVl1MGlib3ltcmd5ClBJazQxRkcyUEdCbm05NUtpeHIwVFZBZ0tmSE1GbFBSSXYzTDhnVHBYUVVqWnVpLzlJWU9tQ1VBbGdYNzhTRmIKOEUrK01BRUNnWUVBM0ttUTljTnIzUGRlcnloUUdkSTY0TC9Va01jcUNCbEZTdkRDV3E0M1NrcjdlQXEzMXFnagpiSWY0NVROcTBqUnJQalhNajBkYmt2eVo3TVZ0bE5FVVJXZUlyL3hrTEZ3SkhodGwxeitCektMa1IvZVQ2MGJuCkk5M0hHUm1PYU8zRDREQXJNdHE3M0pmVjJQMGdvanJvejA5VllnMEg5VzFWRFkxRG01SXB1REVDZ1lFQTVFbUcKcDdPZFpjZ2VVSVJZTTh2M2NLQTdZd0hzbG0rZDFDVVhYNHVxb2xNSVNrS1NOOGlpMDVJOVFKWlpOcUxMcENuZQpyMWJHNE9SOUxlWERneFpQNmlTUTJCUlluNWVYRXZRQ0xLazNidC9NSTRmeEM0ZkRyKzNQY2dlWFFLNVhFZnROCnlHN3hVQm1sUjFGYk51Q29ydDliMWxhS2I3UlBJd3RCdmJTTWZ3RUNnWUFpdGRXa295SGpkMUlBa1lIUUhmNisKL2MzdEhEY2pZUDVDWkk3ZC9zdVp0eVBKWlQ0MzJPa0JtSDN4Wjk0a3hMUWQ3QTZLZHpvVGJBSzJlUFBjMWVxdgpaRExmSS8rSjdzeE1YUmp1L0FGcDlER2VsSFpES3pzT3JFTTJVb3ZSTzUxMU5YNkdHRncydmZlWWszQy90QzZNCjliakRuTE1reXhiMjg4S3Z4UlVrOFFLQmdRQ1Q5L0IyM041RnJidXdkc2Z3OHVEMHVIY2x5b1orVCtTZU1GaUIKRHJkUU5iK20ycFdKNE50aGhXVjhhcmR5eVh4emNNd3RISE1XTENQVFR4MDE1NDF1OTdxR3hGRlpTRm1jNkZwTQpkblkrd0lMQitRaE5iL2R3SGhXYkZMNStKMEs2bmdnaHhYOVdhdmtOUy9keWo1WG1tMUlja01WMGVBdmZiQmwxCmpBU1JBUUtCZ1FERDBjeGQ2a245eWF3eDhxWC8vUnFwTTNLenkva0pqODBERFQrMnBJLzFubEZ1czV6d2w4Wk8KTDkxZ0V5d3ZuY0hmNFI5SDdyZEg5SUhDL1VtSi9OWHNzK3Z0emc4QW82YWtkZWFEcWlkRHdMbmxiYWVmSlI3egpTNmluUStmRk1sMjdPTHlVSlBZZ3gxZVJrVDFaWllSUVhQQVZnYXYrYnFPVTdFdVFnNDZSNnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJU0FnV1ZjTWlOcTh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBNE1EVXdPVE15TkRKYUZ3MHlNVEE0TURVd09UTXlORFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXlMNDhDY2p2Z2VSQ2JGNEkKUUxEU0FQdk9MOThKL2VvNkdSbFcvYlo2cUNzbVZKcTgrQWdvdmpMSHUxbElReVJPbHJBeUFTeWMwbmMySndLRgpLN2pONElqWDNSVTlER3F1bFRYL0hXTW9NK3RLdTk3cGVRWG9FR0FLaWlZSG1EL01DY0IyUG4zc3l3TWFyU0xqCnY0QlZ6c2xqaWN3SDZobExhcmNWQ3RUV2gxbUlJZ2RvdU8vei9zaFlUNzVBM1FRWHpWTzg5T3pFS25NSENPVzEKeTl5cHJBMjN3ZVl2K2lSdVQ5V3MvUmsrQjB6UXRlWEZBWlp3aUFNMkpsNkRVZno1aE53TTdraW9BRzdoYmU0RAphK085aHI4eHBwbDFId1RzTUU5bFRWZE0zMmVaOFJxbXNpcUFBYkVwUnlSRVJnT2xHa1ZrU2FNL1prVUdtY2h4ClB6ZG81UUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNVHVjWUNadHlNTTZ0ejM0dmNPdEljbEVRcVRRS0YrY3pTNwpMVXg0Um85c2hvVW9wV2hNdVV6VDZidG9WT010MzJGUzY3cEw0MUI2eGlwVGlyZWRCOXJPU0Z6ZThFU2psdFo0Cms4Z3ZCY0FDVE93V3hidDVHekhMUlpEOXA4SjZRajlVelQ3ZVB3QUNCZURIMjRWV3lKaktxalBKZWJzNUpaVUUKa1hZVGxaUi8rVzBYYkxBRjE2RkpPMlk2RERRaThaR3ZmK1h6djFoSkpHSXpsNS94azF4Tk1PV0V6M1dlZVNwUwpqOHBTaHlzclVVTWpRcEhsZnZSWTJXZ0FRcndmMFhCbUFMRDNGUktDRkxzbmw3dTY0QXhVVERsMTMvM1pGckpJCmJsS2hVWnhzNFdrL2RoYmRlOGRTVFY4N0Vsa29WaFA2c2YwYUJtR0tGbkhpeTJKNkJJWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeUw0OENjanZnZVJDYkY0SVFMRFNBUHZPTDk4Si9lbzZHUmxXL2JaNnFDc21WSnE4CitBZ292akxIdTFsSVF5Uk9sckF5QVN5YzBuYzJKd0tGSzdqTjRJalgzUlU5REdxdWxUWC9IV01vTSt0S3U5N3AKZVFYb0VHQUtpaVlIbUQvTUNjQjJQbjNzeXdNYXJTTGp2NEJWenNsamljd0g2aGxMYXJjVkN0VFdoMW1JSWdkbwp1Ty96L3NoWVQ3NUEzUVFYelZPODlPekVLbk1IQ09XMXk5eXByQTIzd2VZditpUnVUOVdzL1JrK0IwelF0ZVhGCkFaWndpQU0ySmw2RFVmejVoTndNN2tpb0FHN2hiZTREYStPOWhyOHhwcGwxSHdUc01FOWxUVmRNMzJlWjhScW0Kc2lxQUFiRXBSeVJFUmdPbEdrVmtTYU0vWmtVR21jaHhQemRvNVFJREFRQUJBb0lCQUhBRm1NTnRHaHJHSWpzUApEbFByV0lXci94ZS93M2VxcWRrdnh0ZTJhU1JIVUJDT2VUMkFjQndUZ2xvT0xNRXJGYUFKbXg0RW8wN2ZyNXg5ClQ0dGlpYUR2UEdiblh6WDZvb29wbzcvbWdaelhoTkRxU0NkOUlFOWpDUDZtMGo0bis5akZTamI5VnBMRG5MTloKY1BhQXkyR21DS0h3OWNteGErQ1ZZbXkwOFRKOXliaGU3WnU5V0lxNVdxeVZENXV3NmVaRWF4SHZSN2l2UDgzUwpqclFucXpCMmlJbnh3T1Zxa2NwOEU0OTFiWXZITmcxQkUyNjg4ZVpZUXJmZVRVM2hTY2Rxd0ZUQ1d2V0F5R2gwCkx3S3hDRlp4b3M4VHdjZGlCOWR4MWRnQ0pPU0V5Q0ZPOG5ESkhXMnlnbE5STzcrZGxhdTVySHJxYVZ3cXhreloKeGtLZVNRRUNnWUVBelduK3BxdmxCcyt3YVlvMHZqZ1BPVHY0Ym9qNitrTlVPa1pEaUZTMmNZV21qTml5V3RjdgpVNlptZ0hhZmovOWE0Tk5Ga2tCRlJTaVNadHpEWWZtWFJGVGVmNGRRSmJRVjQ4VHEzMzdWMEgvT05BK3Y0c1dhClpCYnJuRXFWZnBjajRjMkhOSys0MjlrUno4VTErb0RXN2lhemw0M3V6RWpwTWRicDlHVU9ESFVDZ1lFQStpM0UKa0xKeGc5STBwb1RxZjkzODdCRy9GbURJd2ZxcjFJbGl5R3lNZ1o2MGZ0S0J2RWRjVU9ycGhJZjYrWW1UNXRhUQpadFhzRHZ4NW4wUnlhU0tKTnE0MWNQVkdFZHBjK3o1Ym1ENTZFU1owZnVvYjc5aUpGYWVXZTc5QURLeTNHZGZDCmRWZm0xUGhoTU1GaGcwMnB4NW9ka25aR0VzNWUrayt0cWFZVUhMRUNnWUFoYjl1UDdmTStCSmpHMVVSNG9rOTQKRlpiL0J6VXpmN282TWkzVUIxWWJiSklMNDBwRkZ6b1E5OGsvcUErWk5RdnFCUG9TTUh3V0llQ1M5ZVNvRWlUWgpicWM1UXlGOHdhKytmOU5yeGcydi90M21BNWV4NWxDWGNsT3dBVVFNY3pYWUQ4aXVmdHdzalUwazhRazBXYnlpCno1SDBYWm85anJERytDRGxNMzN4OFFLQmdFNlloRkZsRGc1NHdudXg5QzNab3JUVFduSUFVL0hFKzZpWXhNVHMKZlRQWGxTTG1wVVZ1TWMxbUQ1aklVNHVEc2tocURoR1FrVW1mL2VHUVVsVS9PVlpKWXBhcko2bENMY1hzc0QvagpHTnc4ZFlyTnA1c3hMdGZ6djIzL0JuTTA2NDBkNElTVzZmanNVelJLL0lTUXFJOEJsdHJGZDN3L0EwMm1MSXZJCmxqYnhBb0dBZHFDeWRxbklqQW51a3VEWXFxalBSVDFvUzEvVG42NHpDcE5JYzZOMzVhZTZiTG5KcGw3bmM2VzQKSGhKSEhSa0ZFYnFYTisxVHQ5a2ZZYW9xRjdXTTZmVE1DNjVXNUNhSjBrSGpqamZuenlITmtQZFRLalRMRDZqYQpQSFdyMUlDMmNmazE4cDlhcFVmUkgyOVhUR0Jrdisxb0ltVFFqbmt2YTV0TkU3WGZxYUE9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
diff --git a/kubernetes-configs/dt-berlin-pod.conf b/kubernetes-configs/dt-berlin-pod.conf
index e230f99..ed06ff9 100755
--- a/kubernetes-configs/dt-berlin-pod.conf
+++ b/kubernetes-configs/dt-berlin-pod.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EY3hNekV5TURReU1Wb1hEVE13TURjeE1URXlNRFF5TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTdlCnE0RHdIS1g4NDRYaGtDS0hSai93bXNmSWxHWDFoVFh2b1Jtd1BtL3JCUFRuSVpIdEd6Y2F6a1l1eFdzR2YwcXUKMnJ4dGtmSXVLWkNHM3pKbVlvTE9saFJLQU9zVTJGOUNlSUJjTU03N21GTktZV0FSbk1LaE5vZmN1TG5aWXM0ZApHZzg2Nmo3WTFVUXFrRExJaXdFMi9zeUlKS0ErR1NhLytjK3FVVEJNUjd2dFJueXlwWExKV0tBbVVla1cyY2ZVCmF0bDljSGtrMWJ2NXlONmtwZHZzL1dLV21MYy80aldPb3dxV1ZRd0xwTFRZTnJkZXZhRkhpTHgvZFdWdkg1eEoKVG5VYzVCUUpaQXlWOG9za1ZjMG4wbTdyRlA4d0o0Skd0QTJWVWFOS3JxWmM0TlNDMVRicVRkVGZ5QjBjQ0x4SAppT2RBa2xvYzBKQ3dnd1J1Wm84Q0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJeG1NVHNWM1hGRzhSSDNJZTFRcVhqMXp3dG0KMkJjTzRVZDVlcE82OFowcGt1amExZ3MvTGt3MjJzUFAxWDhicE1pL09oUUtBK0xPUndyWVpBbENUM0R0OVI3aApUbGFLdTRabmUzaGRSbWRMVlpnaEJ0RElQcGdiK2NlTjFnK3lwb1dpYnZORDJYdCs1aitRZ01OeS9Dc0dtWkZYCjhlWFBZa3F4Y3JnV3lnRlhDMC9DckcxVG16bTVTc21Fc3hiOEFGS1BCRVdNTEtNZHhTYnVCU0NLbEltZDZiQXUKNmZWR2lTWVFGemFtRURtbndZNURwbWdpZGVGM3RUZDUwamNtSEs1UkpNRDlJSkNTK0MydEVmazQwNHZPY2E1TwpTV3Bqb0NXbWRZa2ZyNVBJa2JsQmVEMTBVOU5sSVlBa2RONEtWM3hqbitOSzZLbk4zMlhRbEF3ald3RT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:40563
-  name: voltha-minimal
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01EZ3dOVEE1TXpJME1sb1hEVE13TURnd016QTVNekkwTWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTTVGClFubFMyQzJEdTJxeEg3VE9kUHZHakJiLzhOTEtXMDJIeC9rYjFBMUJxUG91aUJ1T0lIRHhVMTlOZGE5ejV1MEkKNzBNNmlzVVd0ZE9ZK0tGZEhheHFnajU5V3RGNk1CWjJnbk1iNWkwVXRTaHk2S0dNTHBkUXpQYlRabjJRVjY5WAptVzZJOFdXK0RQVG1GTWh2YnlYYU0xWC9XWWhyK0w1SGg0M1pyS3pJRm5NYlNFWkdzb2RWbmVRMExwQStUZkJIClkwNENqdEFEaXlUREJiRkVoUjNyWVlMTnJ6RFdwdktVY3gzSkVPTjU1VkNiYzFWQXNtMkFxcGFHMjJIUVVnZjQKZ2FLN1FEZVZlekZvenlqV3FOV0tPQkxRc2lEMEdXaCtlQ3gwV05wWURHa3JyVzAxaFhyRWZkZ0Y1SDdaYStSLwpGUU11NWxUb3Z4MDIwZzJNN1JrQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFEbW9qVkdXdnYrZFZSZW5laWtoemhZemJoOGUKRjY1QVM1TUFGWFZWMjVrV2NvV1ZxTk5uNmdYY0d0aHpLVDNJSjVtTDhpM0dQbWdqd3BmQWJCNHQ1QkJBK1IyNwpWTGRaWGprb2NkdDBmcmoxOFdjZUw4UTdvWFA0eS9VamUwOTkydmNTclRnbG1pRjNGcitTNzdwOUp3a25ZNEdwCmZnTW9LNm5jUWkwVVpadFJ4bUoyWEpXMndabzkxbFR2Y2JZZzgxYlI0MUt0a3JpRUtDYlArTEdWSlJMc2h2SjMKWHVBSndkUElpalhxOGhXREhRTWlGSzVpN0FJRmV1MmtiQUtaSkZ1YlUrS095cWljUDhGL0wvSW5zYlBEVHZySwp1STdXZ3JERHpzU3IzQi9oSjhwSWVLMk5Gc3pYMEdlZWlJbTZMZ0xQWW9rSlVMZ1JSV2JYVXIzNnBDTT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://127.0.0.1:41011
+  name: kind-voltha-minimal
 contexts:
 - context:
-    cluster: voltha-minimal
-    user: kubernetes-admin
-  name: kubernetes-admin@voltha-minimal
-current-context: kubernetes-admin@voltha-minimal
+    cluster: kind-voltha-minimal
+    user: kind-voltha-minimal
+  name: kind-voltha-minimal
+current-context: kind-voltha-minimal
 kind: Config
 preferences: {}
 users:
-- name: kubernetes-admin
+- name: kind-voltha-minimal
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJQ0ljK096cndNaTR3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBM01UTXhNakEwTWpGYUZ3MHlNVEEzTVRNeE1qQTBNamRhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTEycmJNTXZ0R1J5Wm5zcGIKNlYzeE1DOXBpZEJTZTRPMC9jcHpGYmd3SlhKY3kzQjZvK3QrdzVkZitTc3FCL3JuZzZ6MTJyMVYxWGNBNGNLSApXaVNvTXNmMTVqRE1teEZtL1J2MUNjc3c1VFF0emlRdmo4RW9tVWlKTmRYTnJnSDVZZnNaWi9OVkdKRDRQcld0CjFaSHArS2tra1VkU09zcUY1YWpaV0pSYVQyVC9vWkY2SW5yd2NQcDRIMFRCZXE5bjI0R3FORVFVTWcxK25uSXgKZ3VncVJaSVlndmVmay8wTkRGMGZYSVFqbTlKUUh2Rkpydm1tZDVEY2loN2srWWllTk9HbjU0L01RM1hNL2k5YgpuSFI3ZXdxYjZFc0l6TmNUWDlPUEtZNzJOZlhOU0NBSzk4dVNvejlKMGxaaWlIRk5kUlk2NDR6RGY2aWQwTjVVCmZpOExDd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFbU9wbUU0V2o2S24vQlIwL2JyS1RJYU9HbUl5cERBeU5WbgpiVTNBSUlranBqRTBsaFFXcnVEeTRjZ25PelNSVFFHVjQ3R0FvbllTbHo1N3pnNjRmblJtN0xiejNnMTVXR2NsCnlkZkU3NHhGRVpncG1xaWtiS1JTMWdDSkU4czdKOEVjMi9JK1pJM0NxV01GWENvcEVteUFUcndnQ0FSNEo5djgKQW5oWG55TkZzNm1TUDc4SnF1RVlOZ2pYbEN6ejF3cnpMU3ZSUFJPUEV3TjdpVGNzTVREcTVNK1paTndJcngwbAoxeXVMQzRpdjgwNGsxdDJMKzFSWDB2SmRsWG5HTTNvNEYxRnZrR3BNR2NoVFZzU1MyVnN1S2VTdndvc0R3dHVFClo0SWZHc1pLYjh0RUNhM3hFWnJiM0ZBNnBDR1hXd01lOS96enRhbHN3cGJBR2gyeGt4RT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBMTJyYk1NdnRHUnlabnNwYjZWM3hNQzlwaWRCU2U0TzAvY3B6RmJnd0pYSmN5M0I2Cm8rdCt3NWRmK1NzcUIvcm5nNnoxMnIxVjFYY0E0Y0tIV2lTb01zZjE1akRNbXhGbS9SdjFDY3N3NVRRdHppUXYKajhFb21VaUpOZFhOcmdINVlmc1paL05WR0pENFByV3QxWkhwK0tra2tVZFNPc3FGNWFqWldKUmFUMlQvb1pGNgpJbnJ3Y1BwNEgwVEJlcTluMjRHcU5FUVVNZzErbm5JeGd1Z3FSWklZZ3ZlZmsvME5ERjBmWElRam05SlFIdkZKCnJ2bW1kNURjaWg3aytZaWVOT0duNTQvTVEzWE0vaTlibkhSN2V3cWI2RXNJek5jVFg5T1BLWTcyTmZYTlNDQUsKOTh1U296OUowbFppaUhGTmRSWTY0NHpEZjZpZDBONVVmaThMQ3dJREFRQUJBb0lCQUd5Q1V1NzlpZTBBVHhHQgpkVkxVRTAzbVZBOHJkS0RxOHh4MEFneUt2eFhkeVloZ25DWTkxWmpJZzN1TGxweDJjbkFOaTdvbmJUa2R2TC83CnNScGpKS2FQdXZtODB4TzViRnRLM2QrVkRvZ21CSHkyRlk4Z0NVZE5GbkNieGdORTAwM2JvaXlPa2VyUiszbjcKSWhsV2FyanEycFNqakhRNDE4R2JqLy9pbXFzcWxDN0kxaUZEMEYwMk1tQ3pwQ3hKUVNTTkFlbGQzTFZaNkRhUAoxeHpwaWorT3hpSWxSSFlOaE56d0ZXOFd5TG9EVXJKOHNORy9yQ3BLSG1BeFRrRmhjcm15OHE5TE9UUG5uNGZECmx3UWNDazRLWmVtR1o0eTdXcno5M01MbzZqbDNOYldsSkk1d3ZNcDB0b1JVZlpvV2ZyYWY2NmFKVHVTZ0FGUUcKZlFZU01rRUNnWUVBNHFsVE1zTVorTGFzaG5valozcmZqcFFJa1lpLzJMR21yY2NSL2psNlhleWVvaXJFeUExWQp0eTZmREg5SS9UcXFwZzJWeUR5QVF5Z29tVkdIbUtmWnNtWmoxMzdWbHRtaDI5NjlYUGNWNVdCb2I4bUMrVWxrCjQ1QWVrWWpCTE95YWsrTmhwa0dzaHpmNURUODh0R2VyeTNmK3RWZGhQNXB0U0NXdVkyOTZIcE1DZ1lFQTgwenkKeFhySTFuZW4zd3JMZytBaFl2MWFGdG83b2I4U0h5a2tPa0toYzVBQWVpY1pvbDFYRzBDUHpsR00rc0sxbWhRMwpSK05SUytnWW9hL2toRG05S0hTVjJkSk5KRlFqb2xiYUlwRitYTFBrblk2eUZ6NXY3UzRIKytxRjZBbjVMZkRkCmxOc3QwTXlocEdNZkgrTERoQzZydm5MSit2WmsxS2tPWHZRWk5La0NnWUJqbE5MWnRYL2VscHM3eGNOeVBqaWoKMG9QbE5MaGN3c2doQnhudm9GOFRqdGF2RnEwMzJ5MUQ1YmE0N2Q4cWFqRDVIWFRWOFViRXVvc0R1Ujhpd1hQUwpma3VWTE1NNE1FdDladUc1UzFFU1lvWGZ2eC9NMkNMOEc2QmlmanVvdWhhN3JLV0ZQc3RHNlIrQlkyd1BNcEQyCnByU0FCWERUV2N4emF5S3Z5eFZUQXdLQmdFQnhubEJlZ0hvR1FhbmJneUtRS0dlKzhiRGg1eStsbTVnelhvd3IKLy9YTEs4VXZQQ1A4azBqOXBkbWhValZOZzZxbk5pbE5kY2drVnZua3pDT1Y0NXVtbmRhUFZLMk50ODZWTUx3OQpTM29ra0NhSG1IWjlyRW5uaW1mWXE5VlZadkliUGFYakZGU2REeWVxdGFETmdMb3ZYb0JZaVZWM0ZDZ2NDMWx0ClVJdlpBb0dCQUlxMi9LZ1J4cTFTRFhjVFhoZjlpRmI2RE5oNzQ1OThEZm5COStSNmprbS9vNWxaUUVERGtpUk0KZUV1SFZjcVVoeVRpZXlhRzdKWXdqdkg5N3hpTERXSGZaYlVPYkQrOEZSVFhzWnYvUTVnQXZqMjJZcFN1U0hRYgpOd09tbXVjK2t5N0JYdG9yWkxJNW11TzJtczgxSU94a05RVXpCSHl0TzhMNDhGK3lLWUV5Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJU0FnV1ZjTWlOcTh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBNE1EVXdPVE15TkRKYUZ3MHlNVEE0TURVd09UTXlORFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXlMNDhDY2p2Z2VSQ2JGNEkKUUxEU0FQdk9MOThKL2VvNkdSbFcvYlo2cUNzbVZKcTgrQWdvdmpMSHUxbElReVJPbHJBeUFTeWMwbmMySndLRgpLN2pONElqWDNSVTlER3F1bFRYL0hXTW9NK3RLdTk3cGVRWG9FR0FLaWlZSG1EL01DY0IyUG4zc3l3TWFyU0xqCnY0QlZ6c2xqaWN3SDZobExhcmNWQ3RUV2gxbUlJZ2RvdU8vei9zaFlUNzVBM1FRWHpWTzg5T3pFS25NSENPVzEKeTl5cHJBMjN3ZVl2K2lSdVQ5V3MvUmsrQjB6UXRlWEZBWlp3aUFNMkpsNkRVZno1aE53TTdraW9BRzdoYmU0RAphK085aHI4eHBwbDFId1RzTUU5bFRWZE0zMmVaOFJxbXNpcUFBYkVwUnlSRVJnT2xHa1ZrU2FNL1prVUdtY2h4ClB6ZG81UUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNVHVjWUNadHlNTTZ0ejM0dmNPdEljbEVRcVRRS0YrY3pTNwpMVXg0Um85c2hvVW9wV2hNdVV6VDZidG9WT010MzJGUzY3cEw0MUI2eGlwVGlyZWRCOXJPU0Z6ZThFU2psdFo0Cms4Z3ZCY0FDVE93V3hidDVHekhMUlpEOXA4SjZRajlVelQ3ZVB3QUNCZURIMjRWV3lKaktxalBKZWJzNUpaVUUKa1hZVGxaUi8rVzBYYkxBRjE2RkpPMlk2RERRaThaR3ZmK1h6djFoSkpHSXpsNS94azF4Tk1PV0V6M1dlZVNwUwpqOHBTaHlzclVVTWpRcEhsZnZSWTJXZ0FRcndmMFhCbUFMRDNGUktDRkxzbmw3dTY0QXhVVERsMTMvM1pGckpJCmJsS2hVWnhzNFdrL2RoYmRlOGRTVFY4N0Vsa29WaFA2c2YwYUJtR0tGbkhpeTJKNkJJWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeUw0OENjanZnZVJDYkY0SVFMRFNBUHZPTDk4Si9lbzZHUmxXL2JaNnFDc21WSnE4CitBZ292akxIdTFsSVF5Uk9sckF5QVN5YzBuYzJKd0tGSzdqTjRJalgzUlU5REdxdWxUWC9IV01vTSt0S3U5N3AKZVFYb0VHQUtpaVlIbUQvTUNjQjJQbjNzeXdNYXJTTGp2NEJWenNsamljd0g2aGxMYXJjVkN0VFdoMW1JSWdkbwp1Ty96L3NoWVQ3NUEzUVFYelZPODlPekVLbk1IQ09XMXk5eXByQTIzd2VZditpUnVUOVdzL1JrK0IwelF0ZVhGCkFaWndpQU0ySmw2RFVmejVoTndNN2tpb0FHN2hiZTREYStPOWhyOHhwcGwxSHdUc01FOWxUVmRNMzJlWjhScW0Kc2lxQUFiRXBSeVJFUmdPbEdrVmtTYU0vWmtVR21jaHhQemRvNVFJREFRQUJBb0lCQUhBRm1NTnRHaHJHSWpzUApEbFByV0lXci94ZS93M2VxcWRrdnh0ZTJhU1JIVUJDT2VUMkFjQndUZ2xvT0xNRXJGYUFKbXg0RW8wN2ZyNXg5ClQ0dGlpYUR2UEdiblh6WDZvb29wbzcvbWdaelhoTkRxU0NkOUlFOWpDUDZtMGo0bis5akZTamI5VnBMRG5MTloKY1BhQXkyR21DS0h3OWNteGErQ1ZZbXkwOFRKOXliaGU3WnU5V0lxNVdxeVZENXV3NmVaRWF4SHZSN2l2UDgzUwpqclFucXpCMmlJbnh3T1Zxa2NwOEU0OTFiWXZITmcxQkUyNjg4ZVpZUXJmZVRVM2hTY2Rxd0ZUQ1d2V0F5R2gwCkx3S3hDRlp4b3M4VHdjZGlCOWR4MWRnQ0pPU0V5Q0ZPOG5ESkhXMnlnbE5STzcrZGxhdTVySHJxYVZ3cXhreloKeGtLZVNRRUNnWUVBelduK3BxdmxCcyt3YVlvMHZqZ1BPVHY0Ym9qNitrTlVPa1pEaUZTMmNZV21qTml5V3RjdgpVNlptZ0hhZmovOWE0Tk5Ga2tCRlJTaVNadHpEWWZtWFJGVGVmNGRRSmJRVjQ4VHEzMzdWMEgvT05BK3Y0c1dhClpCYnJuRXFWZnBjajRjMkhOSys0MjlrUno4VTErb0RXN2lhemw0M3V6RWpwTWRicDlHVU9ESFVDZ1lFQStpM0UKa0xKeGc5STBwb1RxZjkzODdCRy9GbURJd2ZxcjFJbGl5R3lNZ1o2MGZ0S0J2RWRjVU9ycGhJZjYrWW1UNXRhUQpadFhzRHZ4NW4wUnlhU0tKTnE0MWNQVkdFZHBjK3o1Ym1ENTZFU1owZnVvYjc5aUpGYWVXZTc5QURLeTNHZGZDCmRWZm0xUGhoTU1GaGcwMnB4NW9ka25aR0VzNWUrayt0cWFZVUhMRUNnWUFoYjl1UDdmTStCSmpHMVVSNG9rOTQKRlpiL0J6VXpmN282TWkzVUIxWWJiSklMNDBwRkZ6b1E5OGsvcUErWk5RdnFCUG9TTUh3V0llQ1M5ZVNvRWlUWgpicWM1UXlGOHdhKytmOU5yeGcydi90M21BNWV4NWxDWGNsT3dBVVFNY3pYWUQ4aXVmdHdzalUwazhRazBXYnlpCno1SDBYWm85anJERytDRGxNMzN4OFFLQmdFNlloRkZsRGc1NHdudXg5QzNab3JUVFduSUFVL0hFKzZpWXhNVHMKZlRQWGxTTG1wVVZ1TWMxbUQ1aklVNHVEc2tocURoR1FrVW1mL2VHUVVsVS9PVlpKWXBhcko2bENMY1hzc0QvagpHTnc4ZFlyTnA1c3hMdGZ6djIzL0JuTTA2NDBkNElTVzZmanNVelJLL0lTUXFJOEJsdHJGZDN3L0EwMm1MSXZJCmxqYnhBb0dBZHFDeWRxbklqQW51a3VEWXFxalBSVDFvUzEvVG42NHpDcE5JYzZOMzVhZTZiTG5KcGw3bmM2VzQKSGhKSEhSa0ZFYnFYTisxVHQ5a2ZZYW9xRjdXTTZmVE1DNjVXNUNhSjBrSGpqamZuenlITmtQZFRLalRMRDZqYQpQSFdyMUlDMmNmazE4cDlhcFVmUkgyOVhUR0Jrdisxb0ltVFFqbmt2YTV0TkU3WGZxYUE9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
\ No newline at end of file
diff --git a/kubernetes-configs/flex-ocp-cord.conf b/kubernetes-configs/flex-ocp-cord.conf
index 434be54..8b7e9c4 100644
--- a/kubernetes-configs/flex-ocp-cord.conf
+++ b/kubernetes-configs/flex-ocp-cord.conf
@@ -1,19 +1,35 @@
 apiVersion: v1
 kind: Config
-current-context: admin-cluster.local
-preferences: {}
 clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQUpGaWMweklPWERhTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt3TWpJeU1qRXhNalEyV2hnUE1qRXhPVEF4TWpreU1URXlORFphTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRQzJwTEh4dityUm9qWm9Rc0x4blZFbkxtV2VPV3puY01Zb3h0bmlrTEdxTnlZNjJsQnpzYm1JQitucndGTVkKRTJEaTg0dXRkSlNrdTBFaHUyVXJ4ak02aGZ6K0RnTjdFaGlySzhuL3pGV0J3K0pzdkRXUUM5aXVPVEVMbTZPMQp0VGpyMXVKMlZMb0Q0THhhMEoydXNIU2ZUanpXeFZ3a1dNL0NUc205RjJNTEhqL2g1QzlOK3I0Y0JXanJVWmZ0CmlQNjlLQ2g0RFNpYVF1MkdIb0FSNjgwVUpoTld4YmZaQUVjNHZnQU5WZ0t2M2ZwU1FGL0xKZUFIRkFxUFFlSFUKZWdQbWczM0g3eUphNTNJeThEaVpvWGFJamFobFdPQkY4RWovSU1wZFZZcE0zT1NGWGc2aFYvd0R6NFVMSkYzdwpVZUxrRFQ2UVd1Z2JqQzM2V1ZmRmZjL0pBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlQxZDhSTlAyUnArSEdOCk94bHVPenNhUWFEbXREQWZCZ05WSFNNRUdEQVdnQlQxZDhSTlAyUnArSEdOT3hsdU96c2FRYURtdERBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCL1lwTVBFdStpSzFpeXZaK01kdmU1N3RxSQpLRi9CWlF3TlZDRGxmYjFkeEI0ZVFjdys1WWRxL1Y4QWxtY1dFbkVUQnkwSEZjOXhmUmp2UzRZaXludXEvUkR4CmIwTzg3L3BOODRwcUNJUjBRYTFZcXRKQzh3TU5ESnA3bWoyYUc1aUx6YUZkU2JsWW5EdjBya2xNMHBBbFNsRm0KZjVPMmM5VXd4ejFaM3J6UVA5T09OZm5iSmtvYW1VUnp2cUNqN0NJRTZaM1RHeEEvUldFZHJTOHZLV2hFUzJZVgorV25QeHg2S3VRaGJES044N2xHVmlDblpNQXNRL1NrRWdXRWxzcmdCc0cvOUdLQlFraGIxUnJyTzM4OE5BVVdPCks3V0JIV3N2R0xsWC84QUFCbHdwWmNuRXFtQmd3Z2NQVmZYNmZ2aHZrQnZ3SU5jMkhmU01Oa3Blb3pyZQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-    server: https://10.192.20.45:6443
-  name: cluster.local
-contexts:
-- context:
-    cluster: cluster.local
-    user: admin-cluster.local
-  name: admin-cluster.local
+- name: "flex-ocp-cord-node1"
+  cluster:
+    server: "https://10.192.20.45:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURneE56RTJOREUxTkZvWERUTXdNRGd4TlRFMk5ERTFORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU5QQzVYR3Z1cks3CjQ4Z3R5YVoxd096NktQa0ZCbWlaeE5Jc2VPQ3ZDdUlPT3htY0FHTkc2U\
+      HdEY0JBYTlUL01HSUZvb0FEMm50OVUKOG9ZVDFRT1BCc3dHZzhBdkN0YXZDclJnOTVFamh1TU1iU\
+      GM5Tyt1bTlMY0lmMDJyaGVvSUN0NkF6ZWdvYU5GaQp1RUdwNTNPUmRXZGRJc0IvRzBLZWFyWEVMO\
+      HBzc1hqclI2V0dxU09Vemk4L21NYUR5VFBNdENhbTE0UVcvRytTCkFESVFXcFZsQllPeVpZRllVe\
+      jBrMGcyQzI5cjBRZzFmTGwzN2lmMDgrSjdiQUZzZDUrSkFKWVl3Y0E1YzNyc3kKWFF4ejhQMi9Da\
+      EVXeStCaXFkUXZEU08yZEJrN3VobnhwbFMwQkw4VUFHQ0dZZ0VTWHdsV1VJTENpcmJwOWdIRwp5Q\
+      mYwMklHeUhQRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRS92ZEFCSnE0b2ZsNENsa21vN1ZVK\
+      0Q2SHNuWXc5VFQwd2IKSTVFNWpyUGxYMUpxR3o2THpLb21RQm9XelJnTWJRUW1PMlVSbkMvazMrM\
+      lFJTWVyOUNLdU5OQk1DSTBxMlM2Two0eXBYeXVNckh2VUFPb1lOWGtWT2dta3pqVGdmVE4wZ3Urd\
+      jRpU3Y0bnBVWHpzWGlqZHBQSzBucUtLTFJNYmplCnpjdjAwcU8yR3BLcEFMenNacjhESmJmeXVNM\
+      GV1TWU5Q1YzM3ZsdmJxREV5cExNUnJ6dkRwVS8yV0o4TndoNzcKM25USmUxRHdKWktzRTUvTmZoV\
+      ytOSnQyeXNmV0t4UXdHN3Jrb25FMHJ1QXQxcjZyczcxSVJ6SGNpQjZybkVHZwp1b2Rod3FZdkpJa\
+      XBaTk1Ga2FvakJDU1k4alFkSU04cWdKTUpTRWZYc1RTM2VEVVluaWc9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
 users:
-- name: admin-cluster.local
+- name: "flex-ocp-cord"
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQUpXVWoyejlRelBUTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt3TWpJeU1qRXhNalEzV2hnUE1qRXhPVEF4TWpreU1URXlORGRhTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXFaMk9lZ20xSDhzSklrOHUKck9nTUsrYXhuV21LUktaYUZPdit6QW9MVk14R1JXZU9xWWVjUUhudmJQRGk1ZlZwSmRlQnhjS3pVTUNEMnNRaApRdHF0TnVjbXJRNE4zWXBWdDVFamdGeFhjVWFobnpDNDZVZnhYRDN1cVE1VGJDVVRLcUlkamhjZzJkUEFTbHY1ClFlK3BZbHEwQ1RmKzVrTmhmcE1NaUlkWGZ5US9PMDNERldqQW1uUmtOSmtOSXNRMW9aTUhyWU9UM2hTM1pQQ2sKUDEvSHBMSHRIRFpBQVpiV0lJa2s5bmRjRk94aEl4WlZnelUrL0ozdVM2bmhDUERuSEFhdHZRMmFwWmVQMk96QgpkVDFFMHVFZmQzb1prcTREYUUyVDd5L2ludU13aWEyeUo5MW5DeDkyS3ZiQzJpazlMNERoQjFDYjNjTFMxZklVCkQ2QTBSd0lEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBckFGQzJIQkFyQUZDNkhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFFZGREMTFLa2hoSVFIR3kxanRwM0tMTjVxeWpCa3RDNjliMTFzVUY1SkwrVTBBYjNPVm5FdnVwCm1TVGthbnRzMmxFVUZaVUpQcTN2WnE5UUkyQXlHR1hvTUw1eGJ3eEp4eDR3WFBWbHlNUXloMVdoZmNnQll6Z0UKVzhtUEM3OGlvZEdDUnU3N3hkUHFkNC9TdVJiYnBQdVNSc2psM1FaUUErcC9Ub2RPWDlIWEpVbktDTGl3TEJWNwpWc1gxZCtKVVJmS2c0NlFIRUxKcldoMDVaTHZaeGpXekxJNDROdG1OMEVKaWZ4YWY3Lzd0K3llQlo4NHlObFZKCmhINllSK0ZzTUp0UU5nTy9VVURsVkxTMzlad1BCL1RGcUk3bStqUFQ1RHVYMUY3RmdWYzdVNWJiWFVybTRiRncKSGJCcnRlZ3Y4b0NOQmJiaURmTDh4UUQ0eU1WZkdkOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBcVoyT2VnbTFIOHNKSWs4dXJPZ01LK2F4bldtS1JLWmFGT3YrekFvTFZNeEdSV2VPCnFZZWNRSG52YlBEaTVmVnBKZGVCeGNLelVNQ0Qyc1FoUXRxdE51Y21yUTROM1lwVnQ1RWpnRnhYY1VhaG56QzQKNlVmeFhEM3VxUTVUYkNVVEtxSWRqaGNnMmRQQVNsdjVRZStwWWxxMENUZis1a05oZnBNTWlJZFhmeVEvTzAzRApGV2pBbW5Sa05Ka05Jc1Exb1pNSHJZT1QzaFMzWlBDa1AxL0hwTEh0SERaQUFaYldJSWtrOW5kY0ZPeGhJeFpWCmd6VSsvSjN1UzZuaENQRG5IQWF0dlEyYXBaZVAyT3pCZFQxRTB1RWZkM29aa3E0RGFFMlQ3eS9pbnVNd2lhMnkKSjkxbkN4OTJLdmJDMmlrOUw0RGhCMUNiM2NMUzFmSVVENkEwUndJREFRQUJBb0lCQUVKdVZ4TXRJaWRsbWhvNQo4UW4vaUdUWlljOUpPc0pRZFEra3JwS3pqR1NWN1IvWncySmFuclFTRGRnWk1JVG9iVnBJNGFiVzd1dzl1bWJBClVsYWcxeDZkd2VRZGtRaW4yWktmNGN1d1h2OGFyc3B1aHIyM1U2elJCTnhwby9yRE9wS0VGQmRHcjdNZzREcy8KY295RWxVN1VQNWNzdTBUc053OGdBTlNvVFhpWjBuQ3JRbWlrNCtBRWRiQ2JlM2ZFb0hpS3dVMFRaL1BlU0UxcQp5TndEc0x2UnluM3RTZHlBdzVYK3lUaGxtZ0FjSytMVmRpNWRRNzgvaFdCZit2Sytoc3EyVGtpQ0JZa2V2cjh2CkZZYjZOQ3c5T0licW14bk1YRko1cnRaMElseC9qQ3gwUEU1OUVHQ0hyNW56d3BJYk1PVHB0cmtmQXlKU1F0bnAKRDE1OVRTRUNnWUVBMWczaGp6dkp3ZW9zUUVncmxMUFBUdFcxd1BwcUNJWW56L2dBV2VOT05jS0VPN0J1U1YwNgpCblU1YzhFZk9ESFNDRGN6ZDZuQURIMWpJdEpFL1JxZk5VYW9RaWM2V3Z2bTluUVNUbTJnRmJLek5aRU1hdk4vCkFpVGladWZ4OUVmcy9Ocm82d3ppc0lUa0RxSVBZbEJtQVhBTTlOd3V3OXBrVm5wY28wYURVYXNDZ1lFQXl0cGkKNEdTS0FXUnduYUV0QUQxOHNzMkIrdkZKbXpxQVQ0MU5Rc0I1OXc5R0FWOFkxS3lpWXJEcHBxODdlT3lUZHpYKwo4UjY0S0lTejA3dTVicndvV1dCRTFwZkc1cXIyc2IvK0wvS0RRdTI5U1FHUXBpa0YybURYSit1bFA1ajNvYUZ3Cm9qZFVrTTcvaGEybkVBMmlmWWcycGlCTnVZVlVkZTdmbHo5NHc5VUNnWUJxWlNYcmF2MWkzSUc0UmVjYmw3Q0EKYit0U2kyV3U3UGZYQUY4MFRxNXVQRXc3MnZ0R2pnY3NkSkhrL21ZRktZWkxQUnpnNnNnaHJTVmNob1Z5QlF5RApqNlpNazNFSERsU0R4YmZmc2MreldVcUlZcHQ0Z2FWc3JHYTRYYXUvRHcwMXRaMjJUNFpSMVF3Q1ZmMHRrZWJSCjZoOFdpbWJZUkxKQTVic3NFUDF1MXdLQmdBNlFLU01VOUxkdTM0cmhoRnFORDRQQ3J6ODF6V1FBaWkrcjVFMFQKaG00UFFhWmRqbW5PVHdZb3owMXhMU0xjVVNYdzBYRzhFOXFNMUdBeURQai9OeUpiZi9Xc0JkS1BtWkJmU1Q5bAorTGg0V3V0LzJrT2psRkQrUE5RWDNkQTRDaWNuY08ra2EwVE9KNWdRUkhzcGoyM1Z0cDZzbVFmbG80K242NU52Ck1odFZBb0dBWW80cHpsd3l0Mndaam9uaUlaN0J6ZkgvQTFobHhpY3h2eU1lRzJjZlAyTHZsM1VZTmc2UEZHd1UKWHZHRzdOUTlFN2FtSmpTWjN4M2FWTDBJZTVtUkpldjFMSFYyVmdOU3hvS0hKeEtBb3dwM2l3VE0rd1loUE9sTApPMXRjV1pYa2kxZkVzbFRRNzkwVkV1Snc4QzJyZVQydWJGaXhkN3YrOWttVjk4YXVKbms9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+    token: "kubeconfig-user-cvpsj.c-kcvfw:f5lgvjvdgbhhnf46rjlzvvrt6kt2wcwzwkmkxg5sqzpl5sbw7967m8"
+contexts:
+- name: "flex-ocp-cord-node1"
+  context:
+    user: "flex-ocp-cord"
+    cluster: "flex-ocp-cord-node1"
+current-context: "flex-ocp-cord-node1"
diff --git a/kubernetes-configs/onf-demo-pod-gpon.conf b/kubernetes-configs/onf-demo-pod-gpon.conf
new file mode 100755
index 0000000..188c654
--- /dev/null
+++ b/kubernetes-configs/onf-demo-pod-gpon.conf
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "onf-demo-pod-node1"
+  cluster:
+    server: "https://10.128.100.70:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURjeU5ESXlOVEF3T1ZvWERUTXdNRGN5TWpJeU5UQXdPVm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU1jSDZ5b0FOZjNOCndvS2ZDR0JKWTl2a3hKSEhHaDFleit3ZnJQQm8wb1BMWXBxRzZIK3RaW\
+      StXVkR0WHNrL3VzVzlieElqRmZCTHYKaHU5OFZQYTI5QjJIYko5WUVjb3ltZEd6ZUd5Ry9xenQxQ\
+      0U3ekZlZHVoajh4ZHRKMmxmaENJUXFWaytiV213aQpHYktZZmc5WVNpNHFZMG54emlkWHMvdU9vU\
+      kNPR1FJVk4wTjhpZlFaUEdyaVBCaEloQ2tob244dEhyUmRUNkFVCmxnWTllMVBqdHNQbjh6aWxxd\
+      VN4NGZod0ZCdGNoc0theWpseUM0eFJKU3ZpSnN2K0NSNXl6a3B6eGJOTm5MOTEKZitYQmVRSDMvT\
+      mZ6YkZ4enNUcEp5SGc3WnpMdkorMCtxNm9jWjVTdlB3cFdDNFNSNmtSWjFIRlpING9VZGZoeAp5M\
+      kF4dzNBYzZkVUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRkEyZnpWTmxhVHdrZGlQc2Jxc25VT\
+      TAvWitGMjdMWVB1RGsKaG5FQVlhMTVaVmhXOGthbkFUZ3UwRnAxZS84cXdwN2JlT1RHMUhSUGdBT\
+      mJCSFdPbjNRWllQRlZqVDhaRitpUgp6bWtYRVp6V1hBV1gzQkNCVlVBNm5SQWNpWW1wZUpiVEkvb\
+      UFONlpJTlRTRzc0anltd2sxYlBQRXlFOEZPZU1iCnQ1bWtaSjhIcFhubXVXMVltZmJvNGtnUUQ0e\
+      WU2UjlzbnJiTkhFZ0cwTmozd2FPNDlyY0FPOGVadnZqTGFrWUcKUFVMV1ZWaUFDYS9vaWYrdmprY\
+      WVoS0w3T3MzcTYrcnFERWdodmRoWTdxTWkwMFJYeTY5alJrSDNjQ0VqUlcxNwo1UWtJaTU4L04yY\
+      k5KcmduaUorWGljMUhid3dja0t5SitnZ1k1UDdQUVgwZmJONlhWNWc9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "onf-demo-pod"
+  user:
+    token: "kubeconfig-user-cvpsj.c-77rjj:kwztnzdl5mxjcfdz58gxddscrlnqpmqfp2rnfcgzq6tzj8kt5lp754"
+
+contexts:
+- name: "onf-demo-pod-node1"
+  context:
+    user: "onf-demo-pod"
+    cluster: "onf-demo-pod-node1"
+
+current-context: "onf-demo-pod-node1"
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index e672573..188c654 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -1,19 +1,38 @@
 apiVersion: v1
 kind: Config
-current-context: admin-cluster.local
-preferences: {}
 clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQU1xVDc2cnduVFdoTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt4TURJek1EQXhNekl6V2hnUE1qRXhPVEE1TWprd01ERXpNak5hTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRQzg0V2s4NjI3RFY4cXA5MmdaMDVuL3p5UTNrcGgrYW8reVI4RW5COVJQVUh2cXluUHpNS2xibzd5cE1LN2QKU2JjT3lLb1B4cEtTL2plYkVvUDE3QXJKRDh0d0Fibnh3dmtyN0pmY2o1dG9PcFY4YVdLSkt2N3dCaDVLUHJlMApsL3YvYTYxTlV3YTFjOFdqTmFoQXA2MENCMUdGTlNOWjY3bnNsbnkyQXhNSStNK0tIcWF1R0FkL0Z2aVE2NFo2Cjg4Y3E2ZEIwUTQyVm1tS0M1b2lZa2l3c0R2VHlWbGY3bHhVdWlPeTRsSWxUQmdxRHBGNVJadlFkR0ZJM3hmL0EKN2FlbmRFYkJrQm5jZUM1VkhnaEpuZWZSS3BKQWpjVmN3cUQvUUJkcFgrN3c4T2U0OXBPVlpnd3hoZ0h1cXNHVApaNWtlNUt1T0Z0aUMvd3gvRURaL1NYdUxBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlJFam9kYzdXUTAyMjg4ClMwOUJoY0NVYk1jWWpqQWZCZ05WSFNNRUdEQVdnQlJFam9kYzdXUTAyMjg4UzA5QmhjQ1ViTWNZampBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFDTVhNNXoyQzlWaUNnazBkdlo0YSt5NWhzLwo0U21ubEY1WHUvMXJ3eklkVWtDWkwyRkZramZ3QlFJMjhkNFV0cVhVbDhVRWR6c092QXlTWDlzU2UzRVNFZnFCCkFiVW5CWXJaMTBmWGNDVlErR2JZV0sySjVSSEl0NHFGdmFzZ0JQOVplQVdkMlZJUUFCanF4bnFYYmV1Q0RwV24KdWRqcTBrZEdnekpNMUdITnNwN282L2VVazQrN0tKTUlINkZKR0JpeGdpSVZwNkJ6V2RlNmFtQzVPNzB4S0ZwZAo4alZ2QUZ2MmJQeVY2Tk1MZk9vazJvbGN1REE5aHp6WWh0cUxzUkFiL3gxK1dqcm1qZFJpN296dHhWSHBLTEQ1CmJiNXVxelU3bTRrbkdOVFdOcEU3NHd3WlFHVXdzeG1sZkxoeExRUTZ0L2dEN2NINE92STR1QmM4TTlrRAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-    server: https://10.128.100.70:6443
-  name: cluster.local
-contexts:
-- context:
-    cluster: cluster.local
-    user: admin-cluster.local
-  name: admin-cluster.local
+- name: "onf-demo-pod-node1"
+  cluster:
+    server: "https://10.128.100.70:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURjeU5ESXlOVEF3T1ZvWERUTXdNRGN5TWpJeU5UQXdPVm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU1jSDZ5b0FOZjNOCndvS2ZDR0JKWTl2a3hKSEhHaDFleit3ZnJQQm8wb1BMWXBxRzZIK3RaW\
+      StXVkR0WHNrL3VzVzlieElqRmZCTHYKaHU5OFZQYTI5QjJIYko5WUVjb3ltZEd6ZUd5Ry9xenQxQ\
+      0U3ekZlZHVoajh4ZHRKMmxmaENJUXFWaytiV213aQpHYktZZmc5WVNpNHFZMG54emlkWHMvdU9vU\
+      kNPR1FJVk4wTjhpZlFaUEdyaVBCaEloQ2tob244dEhyUmRUNkFVCmxnWTllMVBqdHNQbjh6aWxxd\
+      VN4NGZod0ZCdGNoc0theWpseUM0eFJKU3ZpSnN2K0NSNXl6a3B6eGJOTm5MOTEKZitYQmVRSDMvT\
+      mZ6YkZ4enNUcEp5SGc3WnpMdkorMCtxNm9jWjVTdlB3cFdDNFNSNmtSWjFIRlpING9VZGZoeAp5M\
+      kF4dzNBYzZkVUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRkEyZnpWTmxhVHdrZGlQc2Jxc25VT\
+      TAvWitGMjdMWVB1RGsKaG5FQVlhMTVaVmhXOGthbkFUZ3UwRnAxZS84cXdwN2JlT1RHMUhSUGdBT\
+      mJCSFdPbjNRWllQRlZqVDhaRitpUgp6bWtYRVp6V1hBV1gzQkNCVlVBNm5SQWNpWW1wZUpiVEkvb\
+      UFONlpJTlRTRzc0anltd2sxYlBQRXlFOEZPZU1iCnQ1bWtaSjhIcFhubXVXMVltZmJvNGtnUUQ0e\
+      WU2UjlzbnJiTkhFZ0cwTmozd2FPNDlyY0FPOGVadnZqTGFrWUcKUFVMV1ZWaUFDYS9vaWYrdmprY\
+      WVoS0w3T3MzcTYrcnFERWdodmRoWTdxTWkwMFJYeTY5alJrSDNjQ0VqUlcxNwo1UWtJaTU4L04yY\
+      k5KcmduaUorWGljMUhid3dja0t5SitnZ1k1UDdQUVgwZmJONlhWNWc9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
 users:
-- name: admin-cluster.local
+- name: "onf-demo-pod"
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQU1uYkRTTFdNWDJDTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt4TURJek1EQXhNekkwV2hnUE1qRXhPVEE1TWprd01ERXpNalJhTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQW4wNUltc3NxN1RpbkM3eGQKbWorWTV4OENvU1VuUXNBNEhxamx5Y3ozQjNTdWdJVUxrN3EwSlpueHppTEFKK0l2TldDUWw2RlpzU0hSSDhKVApWQ3pYdGdNZnhYLy9pcURJVmdTekluc2lzei9wSXlucTRtRXA2OTlUeU5UYzcvZi9VWjJjWi9WZDV0RGdsczdZCkhnZmVGQ1VBekRMcWxaOXZkdUh1NUc5VityU0hrMVVBcWQrN2xGOUd2S0hqeHdCNmcxMWpuT0ladjRBazZ5RUoKOXFacHN4ZE9OSkVHakxoQXZDdDVvQnYweFhSUlNsK0JaWFluaU5JcEpuRHJqb3hIc0todDlUaysxTktQRElRTwpqUTBHSjJicEhlQmRBOFFZT0VKa3NhcnRxVjlINHVaWWhyUWZ5T2M4YW43WWJOQVJEcW9nQzRXdjVCSDhtNXZqCmhDVCt1UUlEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBcUFaRWFIQkFxQVpFZUhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFLRTFsaGJZV2kvaWlLaGFocUNnZk5VaC92dzBabXFiTlVRRzNrU2wwd3UyRlRYd2I4Vm1tUkp1CkY0d3paanRPZXlPWHBzVmxUUkJRM1hkc1ZvVXUvSjNFcURWTytPR0Q3dXkrQ2VzYVhKbDAxQXVUd0pmZFYzMTgKRWI5WnlKVHZpcnZ1MEcyWnRLZ0RrQnN3cWR0RzhMUXhEdHFBbnNWalBUVEd6dXRua1hwbDhZb21qeWtZV0JiVAo2a1k0cjR3Y0hBK1F4UFVuOTE3dXk2b0labzllOVpkcW03Qzl4Qk5zTTgva2grZGc3bmFwRTF4djdTZ1gyS3BCCkMvWXphTWlIZVNabVRrZTFzK2Q1eXJJVVJ3WGs2QWR4Sm5NZmRnZk91SEppdGtOWXQrWWhqK1VvaWxEUVlxK1oKM1ZzTUtKVEZtZTdXSVV6b0lBTEIxM3d4MHQwNUJBRT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBbjA1SW1zc3E3VGluQzd4ZG1qK1k1eDhDb1NVblFzQTRIcWpseWN6M0IzU3VnSVVMCms3cTBKWm54emlMQUorSXZOV0NRbDZGWnNTSFJIOEpUVkN6WHRnTWZ4WC8vaXFESVZnU3pJbnNpc3ovcEl5bnEKNG1FcDY5OVR5TlRjNy9mL1VaMmNaL1ZkNXREZ2xzN1lIZ2ZlRkNVQXpETHFsWjl2ZHVIdTVHOVYrclNIazFVQQpxZCs3bEY5R3ZLSGp4d0I2ZzExam5PSVp2NEFrNnlFSjlxWnBzeGRPTkpFR2pMaEF2Q3Q1b0J2MHhYUlJTbCtCClpYWW5pTklwSm5EcmpveEhzS2h0OVRrKzFOS1BESVFPalEwR0oyYnBIZUJkQThRWU9FSmtzYXJ0cVY5SDR1WlkKaHJRZnlPYzhhbjdZYk5BUkRxb2dDNFd2NUJIOG01dmpoQ1QrdVFJREFRQUJBb0lCQUFDY01TVCtvRFIyWWhWbQpiRWxaOHdEM21tLzVqM1B1L29nSGg1SEZTakRxSG56NWhYalVYenBCbzY1eGJhRDVlY3JQaXQ0NXpQa2pzd1JYCkh6Q1VWMk1vRWVnVXZHclFnTlByZ3JBZ0hwcm5KTUp3dDZpVVRLL05sQ21SdnlMZ0pVY3Z2bGlibFBkOFYwL2MKalBGWWdGNDlZZ3BtSzRYVkxYMGNFbWtua0FHOHk3Zmw4UnYzaUVITFRSN3NMekpqWHAwMk1wMys2bFlXK0NHagpNK0t1NFUvWGZORHZ3UGVXR04rNnZndWFrd29FV3RELytZNHZMODJreWIyYWdaMTRTZUVBY1NBVHVnSmdvQUtSClVYY3lNV1FMN2xQT2JodUhTOXdIU2oxbVBXbWJPUlc1RFFJR2dPckpsK3NEcllqdmxFbkdCVmJHUWtHWXc2WngKN0xwcTQ0MENnWUVBMFBELzFJb0k3N0hRczZ5WWdZWkhmUTZvOGpiNlVaWWFBZG5wb245VlM1aTdvQ2Uzc3Z3bwoyRHhYM3F5SjIwTmNDQUVRazFlSWd4Vk5ZdlMzUnU3U0R0ZTh2ckJHOXhUL2RIRnh3Mm5GQ3ZuL004cVQ1N1dxCnBZcXFsVlhIa0Nac2Ivc2xRQjNPa1A2dmMzY1k0cEd0R3ZPcmNGaWhwL004cTk5YzY4d1hqaHNDZ1lFQXd5OXQKcEpGcWROdmVOd3FnTmMvMEpLUFFKOFEyL3p0eUpvY3Z1emROQ3dJVnAzK0V4WExxdTBvcGdoN0xsRkM4cWRFcgpyNjFNZ2ZKbjB3M0dyZFBYY2FxeWNJWmZVdHpCWHI1dkVvU0ZtUVZNenhkZTU1UVAzM3B4ekoyeGxMNTV5YTZBCkdGVC9IVWdxMDR6TWFZQS9TbVluWGxCZVkrR0RlRXg5QVpHdm83c0NnWUFuc3VLbzIyRS9TYVhCdmJWc1Jyc20KZzdhTjd1dzR2REJNMGI2V1pXTXJiZVdZVkhPT3ltSm9VMjdPbkRIRk8xTXRJaWFvR0NXVDRtUkZ2UUZsdE5LcwpoMGtSWWlUWnBWKzBIQ25sV3g5WktvN1dwRkxkMzZLQXVZd1h1NmlqTnVtN2pSaFN5bGNKTFpyZ2NXeUUvL0RJCkFpdzh1RnBlc3RTQVEzeEFRUkxvcVFLQmdRQ2JDcCtUYTVjZWdGQUJkTVZTT1g5N1kweERhazh0YXJELy9iNWkKZmtrS2gzdGY4NkVwbm1EcXFMeFVDZFk0Vi9HbEN1d2l2Z3ZaNVEybnpuZVZPSU1ZWFRra3ZQZ1hRQmV5Qko4QwpISlpxdUpVTW8wblZ0Znp0emJ0N2gzKzU0WnVvSXA3SnRTcDR2Z3lXd203VkZ2UXZTdm5XcHd4elZuMHlINy9rCmNTOE5aUUtCZ1FDL3AxOENwSVBzWkxLZVFPbDBGNGlsRm02Z003QXRNRlNMd3NMdmgyVlFQNTJVMkFWQThSVTYKeit5VEFjVVlSODd5WDljK2V3QlBSbCt2bUw2THFxeC9iU1Z0bWZUMGJ5ajlhaWtQYzRZQ2x6K3Ywd1E3ZWg5SApPcjV2K0RLdmFoYW1CNG5scThoU2M3Z2VjcUZYbithUDI0N2wzeGt3dDNmNUtwVGhxTlhoZGc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+    token: "kubeconfig-user-cvpsj.c-77rjj:kwztnzdl5mxjcfdz58gxddscrlnqpmqfp2rnfcgzq6tzj8kt5lp754"
+
+contexts:
+- name: "onf-demo-pod-node1"
+  context:
+    user: "onf-demo-pod"
+    cluster: "onf-demo-pod-node1"
+
+current-context: "onf-demo-pod-node1"
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 7d93281..154331b 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -26,7 +26,7 @@
 #    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666
 #  adapter_open_onu:
 #     repository: gcgirish/voltha-openonu-adapter
-#     tag: flow-sync
+#     tag: ttfix
 #  adapter_open_olt:
 #    repository: gcgirish/voltha-openolt-adapter
 #    tag: flow-sync
diff --git a/kubernetes-configs/voltha/onf-demo-pod-gpon.yml b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
new file mode 100644
index 0000000..1c5cd66
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-demo-pod-gpon.yml
@@ -0,0 +1,63 @@
+# 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
+
+#images:
+#  onos:
+#    repository: voltha/voltha-onos@sha256
+#    tag: 6f23767b85a6515bc465c4678c945d194551dd27abe2cf1b926a524b5e9eb3e6
+#  adapter_open_onu:
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: tpstate
+#  adapter_open_olt:
+#    repository: gcgirish/voltha-openolt-adapter
+#    tag: flow-sync
+#  rw_core:
+#    repository: khagerma/voltha-rw-core
+#    tag: update-port-fix
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+nodeAffinityConfig:
+  enabled: true
+  node_label_key: "in-band"
+  node_label_value: "yes"
+
+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/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index b51e753..1c5cd66 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -25,14 +25,14 @@
 #    repository: voltha/voltha-onos@sha256
 #    tag: 6f23767b85a6515bc465c4678c945d194551dd27abe2cf1b926a524b5e9eb3e6
 #  adapter_open_onu:
-#     repository: gcgirish/voltha-openonu-adapter
-#     tag: flow-sync
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: tpstate
 #  adapter_open_olt:
 #    repository: gcgirish/voltha-openolt-adapter
 #    tag: flow-sync
 #  rw_core:
-#    repository: gcgirish/voltha-rw-core
-#    tag: delete-device
+#    repository: khagerma/voltha-rw-core
+#    tag: update-port-fix
 deployments:
   etcdOperator: true
   backupOperator: false
diff --git a/tosca-configs/voltha/onf-demo-pod-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/onf-demo-pod-gpon-onos-netcfg-switch.json
new file mode 100644
index 0000000..42a4c20
--- /dev/null
+++ b/tosca-configs/voltha/onf-demo-pod-gpon-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "Leaf-R1",
+        "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
+      }
+    }
+  }
+}