diff --git a/kubernetes-configs/onf-demo-pod-gpon.conf b/kubernetes-configs/onf-demo-pod-gpon.conf
index 2bb1005..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod-gpon.conf
+++ b/kubernetes-configs/onf-demo-pod-gpon.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index 50d881c..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.71:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-p4-demo-pod.conf b/kubernetes-configs/onf-p4-demo-pod.conf
index 2bb1005..2d99306 100644
--- a/kubernetes-configs/onf-p4-demo-pod.conf
+++ b/kubernetes-configs/onf-p4-demo-pod.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-soak-pod-openonugo.conf b/kubernetes-configs/onf-soak-pod-openonugo.conf
index e22dbc3..be62aee 100644
--- a/kubernetes-configs/onf-soak-pod-openonugo.conf
+++ b/kubernetes-configs/onf-soak-pod-openonugo.conf
@@ -1,47 +1,18 @@
 apiVersion: v1
-kind: Config
 clusters:
-- name: "onf-soak-pod"
-  cluster:
-    server: "https://rancher.opencord.org/k8s/clusters/c-7wvvq"
-- name: "onf-soak-pod-node1"
-  cluster:
-    server: "https://10.128.90.90:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURNd016RTRNakF5TWxvWERUTXlNREl5T1RFNE1qQXlNbG93RWpFUU1BNEdBM\
-      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQUt5M21sS3poSEkrClBsK1VnZkNlMldoTlNRajU0bGk4dWhrRldlTDM0anFDNU8ycFhoWm9sT\
-      jdrVFcwL3BJQWQvN043NVlhZDVkUkQKcWZ1YjRUMVdvNW13N01NWnpIbFNwK2VvYzhEOU1PQnFFK\
-      1J0K3hqTlJpVVNCRDZPYnNGWkk3dmxzOXZNTHRXUwp4NmtOcXMxVDZDNXNPUXJUMXZ6aHZnb3V0M\
-      FVsdDdJRjB0b1ZRbndPSFV6NkxFTmR6MTFJVEwwdW4zR01mMnFFCnppbzJscmZkVHJZNnZZYURyV\
-      E5tUnl1VU5sNmxEenJ3MmMwM1RDSzhzZGI0QWlYZlZWZGVGWHM5WW1tbWJoVU4KYm1OcXVVNXQxQ\
-      0pCR3VEOVVRbGZTTEU3enpSMmxNNGZtd3NiNlVJVTdkM1h2WGJDZG05UmpBeklRd0p5RUJ0aQoyM\
-      WgzZ0k4SFByRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSXhsV0RVU29RdklWaEplYVVwYXBIM\
-      0hXZnZNNE9PcXU3QTEKSllYMU03RGFuVy85WkNJeHVTSnNMendHYkY0ZDM5bk8ydFlZOUR0Z3Qyc\
-      jVSNEdZc01qZzBzY0NJU0h3K0NLaQpERE5UMXVRV283aWtEd0tCdVJDUS9JVW5WTFMwWWhFeGUra\
-      UxwNkhXd0xCU3hpR0hNMnhVaG1KVjBxNGU1R2M0CmtZVkxIOXlVVm9xbVFNRVVjY1RrdkM4VDl3N\
-      DJPUE1QbkJhYkNuKzE0c1kzZzNFU2hJWjdFbzNMUURPUVJQQUkKZHNkdUhxSm5icFY0Sjg5NGlNa\
-      TMyNmJISUc4UHBkWjhhaGpVSkFpa2pnTFIxS1phNjVKSjJ0ZVNCV05WUGxPYgpweTMzdzAvRFlhe\
-      DF0ZWVjcUhocXl2alFaTE1jL3R5Q01qaGMyR3lzUkhaMi9qUFcwNTg9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
-
-users:
-- name: "onf-soak-pod"
-  user:
-    token: "kubeconfig-user-cvpsj.c-7wvvq:wdcbrgtnj96m4qsf2cvqcxb9z7rklgmswmfhn92xdb7p2wwhdf78xp"
-
-
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQWNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURZeE1ESXhNell4TVZvWERUTXlNRFl3TnpJeE16WXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUoyQlR5ZlFPdncyCjJKSTRKUlUxSmZhaFI5ZUJKTitSYnpGV01VZnM3SWg2QmVHVHNyekRWUGFJM2JGS2JQaExkUjV4M1ZyM1lVbzEKa013WGZEU2xscXArOWNBNEZJMWZOeUhEYjhCYXBZb0FvYTNEaEJzNmJ1T0EvVUlSOVA3MHk4Z0thaGZpSlk1Ngo1ZHBMNVpTVHM2VmhxRHp3OEVYaDBMVWtWeWJ4WVlWQzNPbW91eG9iQ3FETHNVcGZON0lqK3M5eXNvU2tkRnp4Ck5wWlI0MlJuZHd3eXV1MkdjYVpqME5KUzZtNTBLVnEvcW1RZVNEclNPU3pueGt6Nkc3aTJMNWZ5dlJINVF2dk0KUHBQa01jZmxUUEpjN0pQNHFSTW9kNk5kV2RHdnhqRnZoZkxOYmg1SjZBc0FmSDNObm1Ibld4UVVHT3k3cjdUMQptYXpHQ3hFVVN6Y0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGRkxWSHRzQ0xwK2hsWng4TVByUE1uUHVrNW9xTUEwR0NTcUdTSWIzRFFFQkN3VUEKQTRJQkFRQ09vcW5ZL3pLWXhJNFl0OUFtSnZIbHhCU21XU0k5eWJLeUg4SFRlUHBFNnF2S1VmSkZRbXZjM2hTVApua0MvbGVJT1JrWHVEWUNlcnI3MFZCMzdycUthbm9QcjlNaGNIbkxDNEhaRjB4LzlYTjhiTDhLZFh3UTlzSm9ZCi95ZkNMWGZ2TTh5dDhibEpEMzhGVzRIRVppTzd4WU1qVG1UZVFvL0VJWTdXYjgrdGRhTjkxa3A5akJ4Y3NzRW8KNGxrazdicFU4NGFNOFNVYklPYThXQkFtSEora2Q4VkFTbHBNWDNFc2UvSGpQSUtiN3RkY0xZTWxFMGw0Zk5ocAo4UFVoY3JrZlBOMmVJYitIKzNCenVDanpvbGh3U3RtZWpwM0kzQUZUejNyNWlwM1FoSFZySXhJY2p4UWtzV0tQCmVTci96eWdYSFZmTk5MNGJZaEhzaVRkWE1ZMFUKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.35.90.43:6443
+  name: onf-soak-pod
 contexts:
-- name: "onf-soak-pod"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod"
-- name: "onf-soak-pod-node1"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod-node1"
-
-current-context: "onf-soak-pod"
-
+- context:
+    cluster: onf-soak-pod
+    user: onf-soak-pod
+  name: onf-soak-pod
+current-context: onf-soak-pod
+kind: Config
+preferences: {}
+users:
+- name: onf-soak-pod
+  user:
+    token: kubeconfig-user-cvpsj.c-vbfjz:hlkw8pzd4qdvqqf9r9h9w86vtn664kt55zjxdcm7sk4lxl2mwchpxj
diff --git a/kubernetes-configs/onf-soak-pod.conf b/kubernetes-configs/onf-soak-pod.conf
index e22dbc3..be62aee 100644
--- a/kubernetes-configs/onf-soak-pod.conf
+++ b/kubernetes-configs/onf-soak-pod.conf
@@ -1,47 +1,18 @@
 apiVersion: v1
-kind: Config
 clusters:
-- name: "onf-soak-pod"
-  cluster:
-    server: "https://rancher.opencord.org/k8s/clusters/c-7wvvq"
-- name: "onf-soak-pod-node1"
-  cluster:
-    server: "https://10.128.90.90:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURNd016RTRNakF5TWxvWERUTXlNREl5T1RFNE1qQXlNbG93RWpFUU1BNEdBM\
-      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQUt5M21sS3poSEkrClBsK1VnZkNlMldoTlNRajU0bGk4dWhrRldlTDM0anFDNU8ycFhoWm9sT\
-      jdrVFcwL3BJQWQvN043NVlhZDVkUkQKcWZ1YjRUMVdvNW13N01NWnpIbFNwK2VvYzhEOU1PQnFFK\
-      1J0K3hqTlJpVVNCRDZPYnNGWkk3dmxzOXZNTHRXUwp4NmtOcXMxVDZDNXNPUXJUMXZ6aHZnb3V0M\
-      FVsdDdJRjB0b1ZRbndPSFV6NkxFTmR6MTFJVEwwdW4zR01mMnFFCnppbzJscmZkVHJZNnZZYURyV\
-      E5tUnl1VU5sNmxEenJ3MmMwM1RDSzhzZGI0QWlYZlZWZGVGWHM5WW1tbWJoVU4KYm1OcXVVNXQxQ\
-      0pCR3VEOVVRbGZTTEU3enpSMmxNNGZtd3NiNlVJVTdkM1h2WGJDZG05UmpBeklRd0p5RUJ0aQoyM\
-      WgzZ0k4SFByRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSXhsV0RVU29RdklWaEplYVVwYXBIM\
-      0hXZnZNNE9PcXU3QTEKSllYMU03RGFuVy85WkNJeHVTSnNMendHYkY0ZDM5bk8ydFlZOUR0Z3Qyc\
-      jVSNEdZc01qZzBzY0NJU0h3K0NLaQpERE5UMXVRV283aWtEd0tCdVJDUS9JVW5WTFMwWWhFeGUra\
-      UxwNkhXd0xCU3hpR0hNMnhVaG1KVjBxNGU1R2M0CmtZVkxIOXlVVm9xbVFNRVVjY1RrdkM4VDl3N\
-      DJPUE1QbkJhYkNuKzE0c1kzZzNFU2hJWjdFbzNMUURPUVJQQUkKZHNkdUhxSm5icFY0Sjg5NGlNa\
-      TMyNmJISUc4UHBkWjhhaGpVSkFpa2pnTFIxS1phNjVKSjJ0ZVNCV05WUGxPYgpweTMzdzAvRFlhe\
-      DF0ZWVjcUhocXl2alFaTE1jL3R5Q01qaGMyR3lzUkhaMi9qUFcwNTg9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
-
-users:
-- name: "onf-soak-pod"
-  user:
-    token: "kubeconfig-user-cvpsj.c-7wvvq:wdcbrgtnj96m4qsf2cvqcxb9z7rklgmswmfhn92xdb7p2wwhdf78xp"
-
-
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQWNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURZeE1ESXhNell4TVZvWERUTXlNRFl3TnpJeE16WXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUoyQlR5ZlFPdncyCjJKSTRKUlUxSmZhaFI5ZUJKTitSYnpGV01VZnM3SWg2QmVHVHNyekRWUGFJM2JGS2JQaExkUjV4M1ZyM1lVbzEKa013WGZEU2xscXArOWNBNEZJMWZOeUhEYjhCYXBZb0FvYTNEaEJzNmJ1T0EvVUlSOVA3MHk4Z0thaGZpSlk1Ngo1ZHBMNVpTVHM2VmhxRHp3OEVYaDBMVWtWeWJ4WVlWQzNPbW91eG9iQ3FETHNVcGZON0lqK3M5eXNvU2tkRnp4Ck5wWlI0MlJuZHd3eXV1MkdjYVpqME5KUzZtNTBLVnEvcW1RZVNEclNPU3pueGt6Nkc3aTJMNWZ5dlJINVF2dk0KUHBQa01jZmxUUEpjN0pQNHFSTW9kNk5kV2RHdnhqRnZoZkxOYmg1SjZBc0FmSDNObm1Ibld4UVVHT3k3cjdUMQptYXpHQ3hFVVN6Y0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGRkxWSHRzQ0xwK2hsWng4TVByUE1uUHVrNW9xTUEwR0NTcUdTSWIzRFFFQkN3VUEKQTRJQkFRQ09vcW5ZL3pLWXhJNFl0OUFtSnZIbHhCU21XU0k5eWJLeUg4SFRlUHBFNnF2S1VmSkZRbXZjM2hTVApua0MvbGVJT1JrWHVEWUNlcnI3MFZCMzdycUthbm9QcjlNaGNIbkxDNEhaRjB4LzlYTjhiTDhLZFh3UTlzSm9ZCi95ZkNMWGZ2TTh5dDhibEpEMzhGVzRIRVppTzd4WU1qVG1UZVFvL0VJWTdXYjgrdGRhTjkxa3A5akJ4Y3NzRW8KNGxrazdicFU4NGFNOFNVYklPYThXQkFtSEora2Q4VkFTbHBNWDNFc2UvSGpQSUtiN3RkY0xZTWxFMGw0Zk5ocAo4UFVoY3JrZlBOMmVJYitIKzNCenVDanpvbGh3U3RtZWpwM0kzQUZUejNyNWlwM1FoSFZySXhJY2p4UWtzV0tQCmVTci96eWdYSFZmTk5MNGJZaEhzaVRkWE1ZMFUKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.35.90.43:6443
+  name: onf-soak-pod
 contexts:
-- name: "onf-soak-pod"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod"
-- name: "onf-soak-pod-node1"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod-node1"
-
-current-context: "onf-soak-pod"
-
+- context:
+    cluster: onf-soak-pod
+    user: onf-soak-pod
+  name: onf-soak-pod
+current-context: onf-soak-pod
+kind: Config
+preferences: {}
+users:
+- name: onf-soak-pod
+  user:
+    token: kubeconfig-user-cvpsj.c-vbfjz:hlkw8pzd4qdvqqf9r9h9w86vtn664kt55zjxdcm7sk4lxl2mwchpxj