diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index 188c654..2bb1005 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -1,38 +1,38 @@
 apiVersion: v1
 kind: Config
 clusters:
-- name: "onf-demo-pod-node1"
+- name: "onf-demo-pod"
   cluster:
     server: "https://10.128.100.70:6443"
     certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
       WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURjeU5ESXlOVEF3T1ZvWERUTXdNRGN5TWpJeU5UQXdPVm93RWpFUU1BNEdBM\
+      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU1jSDZ5b0FOZjNOCndvS2ZDR0JKWTl2a3hKSEhHaDFleit3ZnJQQm8wb1BMWXBxRzZIK3RaW\
-      StXVkR0WHNrL3VzVzlieElqRmZCTHYKaHU5OFZQYTI5QjJIYko5WUVjb3ltZEd6ZUd5Ry9xenQxQ\
-      0U3ekZlZHVoajh4ZHRKMmxmaENJUXFWaytiV213aQpHYktZZmc5WVNpNHFZMG54emlkWHMvdU9vU\
-      kNPR1FJVk4wTjhpZlFaUEdyaVBCaEloQ2tob244dEhyUmRUNkFVCmxnWTllMVBqdHNQbjh6aWxxd\
-      VN4NGZod0ZCdGNoc0theWpseUM0eFJKU3ZpSnN2K0NSNXl6a3B6eGJOTm5MOTEKZitYQmVRSDMvT\
-      mZ6YkZ4enNUcEp5SGc3WnpMdkorMCtxNm9jWjVTdlB3cFdDNFNSNmtSWjFIRlpING9VZGZoeAp5M\
-      kF4dzNBYzZkVUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRkEyZnpWTmxhVHdrZGlQc2Jxc25VT\
-      TAvWitGMjdMWVB1RGsKaG5FQVlhMTVaVmhXOGthbkFUZ3UwRnAxZS84cXdwN2JlT1RHMUhSUGdBT\
-      mJCSFdPbjNRWllQRlZqVDhaRitpUgp6bWtYRVp6V1hBV1gzQkNCVlVBNm5SQWNpWW1wZUpiVEkvb\
-      UFONlpJTlRTRzc0anltd2sxYlBQRXlFOEZPZU1iCnQ1bWtaSjhIcFhubXVXMVltZmJvNGtnUUQ0e\
-      WU2UjlzbnJiTkhFZ0cwTmozd2FPNDlyY0FPOGVadnZqTGFrWUcKUFVMV1ZWaUFDYS9vaWYrdmprY\
-      WVoS0w3T3MzcTYrcnFERWdodmRoWTdxTWkwMFJYeTY5alJrSDNjQ0VqUlcxNwo1UWtJaTU4L04yY\
-      k5KcmduaUorWGljMUhid3dja0t5SitnZ1k1UDdQUVgwZmJONlhWNWc9Ci0tLS0tRU5EIENFUlRJR\
+      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
+      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
+      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
+      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
+      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
+      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
+      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
+      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
+      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
+      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
+      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
+      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
+      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
       klDQVRFLS0tLS0K"
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-77rjj:kwztnzdl5mxjcfdz58gxddscrlnqpmqfp2rnfcgzq6tzj8kt5lp754"
+    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
 
 contexts:
-- name: "onf-demo-pod-node1"
+- name: "onf-demo-pod"
   context:
     user: "onf-demo-pod"
-    cluster: "onf-demo-pod-node1"
+    cluster: "onf-demo-pod"
 
-current-context: "onf-demo-pod-node1"
+current-context: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-p4-demo-pod.conf b/kubernetes-configs/onf-p4-demo-pod.conf
index db13c59..2bb1005 100644
--- a/kubernetes-configs/onf-p4-demo-pod.conf
+++ b/kubernetes-configs/onf-p4-demo-pod.conf
@@ -1,19 +1,38 @@
 apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1EZ3lNVEl3TWpReU1Wb1hEVEk1TURneE9ESXdNalF5TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzRPCjlhcGhPZHVHK29Ga2VqMzJQK21IbHQ1UmxGVG11YXpFSzZ3OG9YNHZuRk1XVGpqanZ0UDJCa05oL3I3bzhVY2UKY3ZFc1VMVGRUSGd3SWp2ekZRakZQL0VEKzR5MTlRRVhDZlIzeU1CVmNpd0FHdTNmRUZQbGtiRjlCWENlVzEzdgoxNHpLSTdMSEFCc0kvQXpMOEpHN0lZd3VMRFJzTm04MTZmWVNMZzB3eHJvRGlCYXJKZDJha0xPdUVVcnVTNjJJCll0aCtFQ015WWNMZGRBdGVXRmZ3NER5bDlWS2MrakFLQWVqR1NVeTBIU1YvNnBkWXB6Zk5Vd3JwVUU2V1VFbEwKaktUcFdoWlkzMGR5VHZIbjB2YzM0SzZ6czlwbmJOcmtaQ0o5MHdFcjV3UjJtZnZ4R2dSVzB6WUhVZGhoak1jbgpIQzlVTDlLY21WQWFuYkRJb2ZFQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHL1dZdXdBVzhmTGR1b2NNaU9XQUFuQ3MvVWYKTlBlaCtlWjVoSkFJYm9XVXVzVDd3RnJONE5RSkFPM0FpUDRjcHl3T1RLTEgyZTJYNjlyMVZqUkZERnpVR3c5VAp0eWcxb3lUTktSbjN0WXlYTFRNTU1GY3pqWFRpSlBGWWMyQ0VBNkNNdGFJTjI5Q0I4UzN3eFpJZmxoOWp3c2xnCjRQZ2t6OTU1czdHT0c2azZ2aW94cWNVL3hDNXU0VGNwa3hLM1A3VkFyMWdoZ3Y1WlJIazJobm5rcm84WUhpNU8KY0REU3BiUXU1alJ3akZQWXpveTdNaHZLVHVLUG5Ma0J2MUVnMjBGV3VjcHZSWDhoblcwbTlTODlhdlQ3U2RQMgplZ0c5ZXlya1ZiUTdlSHRZOW4vQ3ZEbXd2eTR3Yk56Wk1NSGhqUmFnb1Q2ZG02ZUpKdURJdVdqdld0WT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://192.168.100.1:6443
-  name: kubernetes
-contexts:
-- context:
-    cluster: kubernetes
-    user: kubernetes-admin
-  name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
 kind: Config
-preferences: {}
+clusters:
+- name: "onf-demo-pod"
+  cluster:
+    server: "https://10.128.100.70:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
+      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
+      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
+      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
+      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
+      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
+      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
+      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
+      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
+      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
+      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
+      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
+      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
 users:
-- name: kubernetes-admin
+- name: "onf-demo-pod"
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJWTh5WXljell1L2d3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBNE1qRXlNREkwTWpGYUZ3MHlNREE0TWpBeU1ESTBNakphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXoyTlNwazM5UGZPclZWYVcKTHlDSE94ckQ5emhRdkYzY0IzbmF6Z3E0cDgvTW01b0ZjTWYvMk8rVmdXOXo2bDBBdlFvVG9lUUZaOXhJa2k2OQpHR1VjQjZJMWo5K21XeTRIT0s2UDUzL1dubzlNak03aW95RGZZRVFHaFJRQy8xdzBxRFNleUU4dHNtSlF3THB3Ck10RXN2WUJxYm1sV0o1V1pEWmxUYjQ3V0cxeXRWc3ZlYkJEeW91WUpqemdmRFRLeEVZdXlUMGlreHRQc2g1bWkKRlpqZnVmbmQyQ3djdHE0UXlqMWMxMkJ0NEZZTHA4a0pVNXhNRTNONExsNHY4YjF2RGNqb0I0RHE3aElYL0daYwpLYWtXaEZOUUpOMUtpcVk5cFAyU2dSK01RQ3dhNTh2UlBtdkdibHkwb3pZZ0lVS0w5L3NCVkVFWmxZZStPS04vCkRCQ3Fvd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJT0NtWFdabm9YVUFuZVM5aUl5V0ErVnI5YkZwZ2xiaVFuWApOUUZoL3BadU9TOUs3ejc5M0JiWHI3NUZVK3FZOFpWNEVKWGgwQ0w2ai8ycWlWODJvaUxMOTN2NVFuT1luUGxoCmVZQkhnNXdaY25tQ2pRMHF4MWZ2aTRScDV6OFN3MTQvUzE5bWh1bzllZkszMjNnbndHeGVEbnNXM21hRUR4eW0KdjhOZ09yekhHRTBPQ1BKeVh5SWU1aUV6ZlFDMmpjVEJMMktXS3NSeXp0ZGlyenhrNWZqMk5kblhmeXVpRjB2SgpOWHkwZ08vUFBrcGJGYXZOc1V4d2VkZzVOai9LN2MydXRVcnZOMUxiWGhJZEwrelhoeEZvN0kzWlF3RVhjd0lFCm5Sa01RVXU1MFBON0ZsbnVDTzNyZ0YyN09oQW43TnFTcTNBU2ErUG5HbzE1WGdxRXZyND0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBejJOU3BrMzlQZk9yVlZhV0x5Q0hPeHJEOXpoUXZGM2NCM25hemdxNHA4L01tNW9GCmNNZi8yTytWZ1c5ejZsMEF2UW9Ub2VRRlo5eElraTY5R0dVY0I2STFqOSttV3k0SE9LNlA1My9Xbm85TWpNN2kKb3lEZllFUUdoUlFDLzF3MHFEU2V5RTh0c21KUXdMcHdNdEVzdllCcWJtbFdKNVdaRFpsVGI0N1dHMXl0VnN2ZQpiQkR5b3VZSmp6Z2ZEVEt4RVl1eVQwaWt4dFBzaDVtaUZaamZ1Zm5kMkN3Y3RxNFF5ajFjMTJCdDRGWUxwOGtKClU1eE1FM040TGw0djhiMXZEY2pvQjREcTdoSVgvR1pjS2FrV2hGTlFKTjFLaXFZOXBQMlNnUitNUUN3YTU4dlIKUG12R2JseTBvellnSVVLTDkvc0JWRUVabFllK09LTi9EQkNxb3dJREFRQUJBb0lCQVFDL1djQm5xK3Z1bm9iRwpuYmJDMHZ1VGdGV3lKR2J4OXBSTzNaTVNxM2ZIZG9jdVJ3V2dFeGt3MjVhUnIvay9GQUxiYVpIRnZQTno2aCtYCnFjSlY0T3prNmprTGYrc3BsQ1dibWcweko1UXFCc1ExNDZuZnBEUVd5WTFPZXJGdFZuRkxoZ20vZnJjR01ZcWEKMlNzdTZDdWt5ZmpwMlExaVJyaktnRjhvdnAwMDdqcEdDclZGR2hSQ1VLM3EzZ0NMRmtTaW9nMC9CUHBPYitTdQowY0dwZHBpSmMrSHFTeVdGVVRXTmFIS1E3alE2TkxJcko5ZWRSTGt0VVFiTG81c1FmWFJZSVl0MDJEOFNvUFVNCk12aGpjYnJtanFLTXJSbEF1Wjl2Ym9MbE5zZ3lBZFNTell5ajNwem9xQS9aUW5aTlRRazEvTUUrOUg3RlhtMEsKN3lZSk9DeHhBb0dCQU5ObUEyQ0hMOVVwS2ZtbmRyRWhZZVAvNDNHdFdOekUxWmpHcHp6WWUzTUMyTkpYN0V0agpZVytSOC8yQmFaMlBDNzdEVk5OTkNiZnMxLy95V294RE9MN2VLdktlMEUrK25XdkFWR2EweC93YW5ydXFRYmZrCklvaVpGd3NWMVZxMFZ6TksyRGZKOVZnT0JzNk1SSEhPU3ZycE1XVE5SbS9SVkp0TjdpK2tSTjI3QW9HQkFQc2sKc2dHRld4SDNqVzY4SzlqVXkxUUY1Yzhra1IzL2xvUGk3SFU4aWIvSEltdFY3UTFWbDBGcWE2eEZYR3M1L1N6KwpPQ3o2WWZlSXB0dUZpWGp1UUtqZEdkU2RNUkh6U3RSYkJxWUEyV2V6SjlmRUc3Z2VTcEg1cndSWU5lRU4zYVB2CnpWV2lza2c1OTM4VXg0WmVYZHc5NExOSzIvaU1zRFB4VjJqZFZ5UTVBb0dBVTVIY2UraDFiRnNka09nMjc4YzIKbjUrbEZtZGszY0dpZndicFRoQjJuUHpmSWloSDdYV1lLemNUc1gvYmRNSDc3cW5oZXJiVnhMUUluOUg3SWIvaApTdk1oSDFEUklQVkYzamJtSnNRSTJ3emErMjFQRlpkR1g2SEZqa2hQVTlBL09MTzV6alEwblY3T0toRWhiYXdUCjBDVW50YVhBMXF0Mk92OFB6aDJ1YThrQ2dZRUEyYTU3MEErcjJVM3VQQzVEL3lTcXZNQ0Q2ZUR6RzhKZXp5QVEKL3FramFLUU5OR1g5RzVLMWtSRFNGVGJsblZkZEYvT2Q4M1p2RmVSUFpIVkJyQjB1MUc4WXBZNCtheVdyRlpkMAprc3lucEZmSVVCLytPcitldVJwblZlZXpnOGZGOWdPendlZE1pb2diK3YyaTE5ZlJtVVhWRHZMeTZXUGdrcFU4Cnczc2V2aGtDZ1lFQW4vSE1XQWJvNy9WTkFQaXJYNTJRN0FQSitJZFVlcTVEeEFvNGhNK1FiSjRKZk56U1RydXMKdVltcDA4alMrYm4zQThWek5hSlY1ZUxIdDNHbVVLOHBVNGlONzR0ckhxRVBtNzRRUzYvdTFscUFkUlZYUEFCegpEOG4xajYrbUxrS1c0QWFJckFtdDd5emdjUmlUTmJobzBmUUgzSlVaVzRKNlMwNUM3bEZoRUdZPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+
+contexts:
+- name: "onf-demo-pod"
+  context:
+    user: "onf-demo-pod"
+    cluster: "onf-demo-pod"
+
+current-context: "onf-demo-pod"