diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index b93e18a..1784320 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -35,7 +35,7 @@
 fabric_switches:
   -
     mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.90.0.224'
+    ip: '10.93.1.13'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -43,8 +43,8 @@
 
 olts:
   -
-    ip: '10.90.0.225'
-    sship: '10.90.0.225'
+    ip: '10.93.1.14'
+    sship: '10.93.1.14'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -250,7 +250,7 @@
       container_type: null
       container_name: null
 web_power_switch:
-  ip: '10.90.0.229'
+  ip: '10.93.1.15'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
index 632a6fd..befb5a2 100644
--- a/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-multi-uni-TT.yaml
@@ -35,7 +35,7 @@
 fabric_switches:
   -
     mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.90.0.224'
+    ip: '10.93.1.13'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -43,8 +43,8 @@
 
 olts:
   -
-    ip: '10.90.0.225'
-    sship: '10.90.0.225'
+    ip: '10.93.1.14'
+    sship: '10.93.1.14'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -331,7 +331,7 @@
       container_type: null
       container_name: null
 web_power_switch:
-  ip: '10.90.0.229'
+  ip: '10.93.1.15'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index a7bb105..dd429a5 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -35,7 +35,7 @@
 fabric_switches:
   -
     mac: 'cc:37:ab:5b:6d:a8'
-    ip: '10.90.0.224'
+    ip: '10.93.1.13'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -43,8 +43,8 @@
 
 olts:
   -
-    ip: '10.90.0.225'
-    sship: '10.90.0.225'
+    ip: '10.93.1.14'
+    sship: '10.93.1.14'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -117,7 +117,7 @@
       container_name: null
 
 web_power_switch:
-  ip: '10.90.0.229'
+  ip: '10.93.1.15'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/kubernetes-configs/flex-ocp-cord-multi-uni.conf b/kubernetes-configs/flex-ocp-cord-multi-uni.conf
index afd5637..f548642 100644
--- a/kubernetes-configs/flex-ocp-cord-multi-uni.conf
+++ b/kubernetes-configs/flex-ocp-cord-multi-uni.conf
@@ -1,39 +1,39 @@
 apiVersion: v1
 kind: Config
 clusters:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   cluster:
     server: "https://10.93.1.10:6443"
     certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
       WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl4TURJeU5ERTNNall5TVZvWERUTXhNREl5TWpFM01qWXlNVm93RWpFUU1BNEdBM\
+      FdOaE1CNFhEVEl4TVRBeE5ESXlNRGd3TkZvWERUTXhNVEF4TWpJeU1EZ3dORm93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU85R1JBK2JmQVoyCldtNEt0UDE0ODlBb1FKTW5vMzdtTmowaXFVcGlybU0zTXVJUklTRXk4c\
-      2h1cnhUTlRla2ZYU3d1UDNwdVRlZmIKeGh3ZG9WcDlXby9RZnB3WHg3UkIxajdYK25STmY3eE90b\
-      zlEVWd4Z1hQbFFZTmwvTFdxejBONWRmS1YzaXJvcQp2WVVpeVFhOWdWeUFXZGVYREZBWWhXMzg4b\
-      i96OUx0eUs0bWdzd1lPeVphSXNsSGNFWjdheXYzTmtvNzZRL1JjCk5RVXVRaUNlaWhGSEIxNSttb\
-      EFrR1FraUkxRUpCZWFQY0lqTXVOSU9hcUQ2R3krTUQxaFJFcWNwTUtXVEgxc0YKMi9LMTRsYXhKW\
-      GE0RWkzZ0N3SDJCaWVHVWNvZ1ZyNFNROHZReU05alYyL2RnQllzR09aVVM5ZHB5ZzVVUjZpMgpTR\
-      lpWTTVoZmFhMENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBTHBIc2o5azVjVVlCSDg2aGlJTHpKL\
-      1BzRUZoUmgyMXJCRUUKUFRvQ2RGaldpL3NkMWhlVWtwL2VTTzRWa1IzUklCMkhDWEovSzFrR0xSd\
-      3BUV1NBZ0RsbW9WVWZnU3JCVHZ4aQplQ3EzNmo2OGtpZUNydEgyR2RsRm9EbUR4MmJpaWg2MGZEZ\
-      U5NTU15WE9Ed3RoZWtaR28wdHhHQmRTNjBQbEdNCkQ0bys3eTJ1UzIxZVNiSEYrN0ZVeHhQQk83R\
-      DFLOGYrYTdpNWx2VExMYmplUVNNVFJWVkN5ZmVBYUFoRWFnUUEKd0J3QVhpNW9TS21vVWlOc0ZCV\
-      FNwTVRaZGpXdHhsMHhsRTRhaDJYaUZzUTF6WWpIK29mSllnRmkzQ1ZoU3UvVQpDdHU1eUtjVFdaT\
-      zA3Sk9zamtiWTRNb2piaklCaUpOelpGaEI2dGI4YkRNTFdSR1MxMmc9Ci0tLS0tRU5EIENFUlRJR\
+      0VCQUtvYm4rc2NXVWFBCm12QWNOeVh1eUh1OTZGS2JMYlVWT1hiOGpPeDJyTGxRSS93aW5tTUJ2a\
+      FNBeWQ1ZHJJRWhYNEsraVBlMEVEUjAKaEVHVllEV052MFVZdjMvM0U1TG9DWXlrTHNsMFh2YW50U\
+      EdhdHN2Y0Y4eVFjcUVENGZ3OUVVSldtRFRIdzI3TQowTTNwR0lrMlU5UUNWSVUrTFpzMFhnOHk4d\
+      UFGTjNkMGhrSmxDK05xb1J5b0tTZ3lRV1dZRzhlMkxNZURob21JCnYxb1pKbXFWVjY2eUhwOVFCQ\
+      09TdWppdXcyUnRxVjRSTk9yZ1Nkbk1oWFl4eU5yZndlR0lXUmlwSTg2c2toWmsKZ051anVRdmYwT\
+      ExSR215d1JUZ2JXSzZtYis4OXFWeUx5Q2h2Ly93Yi9XK1Y5SXpoZnBnbExDem5SS1RNSGNiNwoyb\
+      HllZ1U4eFF2TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ2ZlbXBtbkNpNVMyWmh5NGF5MnZTd\
+      jVjZi9TNDQwZHhRUlcKVE5RcTc1alQ1YlJjUkR0bmhHeXJIbE1wUVFsL2hpN1JwbmhkTVA2SGZpe\
+      FdmKzdsNU41dXNEZnNzQkxJQi9KNAo1WVFZMWVLVnNFT2dBN3pMMXFPMkFFeDNCRGRSYU9BWmpLR\
+      ldhMjB6b3h3MnoySHFRN0FvUlUvdUZuSG1GOVpLCnkyMUMyd2M4NkFPUjRIT2s4TW1yM25rSWVPT\
+      m9ZZmR3V1RsVDRRUmVaVDZrWTAzeEIvd205VllTYnBVcHE5NksKcHI1aTFrdStLN05wa3hMSUgvZ\
+      GJSM0Q1R2hTK1ZtK3R3Vm01czZ6MzdFNEZkVHBTYzIyNDMxQ1dZb1pyK2lwTAowSVk3MXNaUXBnc\
+      DU2ZzhibjRQeFZPTTFKSTFJb1NlMFFJemF2cndTckd4SFV5WmRpckU9Ci0tLS0tRU5EIENFUlRJR\
       klDQVRFLS0tLS0K"
 
 users:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-bqnq8:r5zxqhf8cwqs6pqlt2k82xjngqkcpslwk2glmlzqf42d6hmctl879q"
+    token: "kubeconfig-user-cvpsj.c-lvptp:cc8crmhkp62ch2xw9xth46bt6hzgzlzbxkfn2f6cj4m7jkjcwfnpv4"
+
 
 contexts:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   context:
-    user: "onf-flex-pod"
-    cluster: "onf-flex-pod"
+    user: "voltha-flex-pod"
+    cluster: "voltha-flex-pod"
 
-current-context: "onf-flex-pod"
-
+current-context: "voltha-flex-pod"
diff --git a/kubernetes-configs/flex-ocp-cord-openonupy.conf b/kubernetes-configs/flex-ocp-cord-openonupy.conf
index afd5637..f548642 100644
--- a/kubernetes-configs/flex-ocp-cord-openonupy.conf
+++ b/kubernetes-configs/flex-ocp-cord-openonupy.conf
@@ -1,39 +1,39 @@
 apiVersion: v1
 kind: Config
 clusters:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   cluster:
     server: "https://10.93.1.10:6443"
     certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
       WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl4TURJeU5ERTNNall5TVZvWERUTXhNREl5TWpFM01qWXlNVm93RWpFUU1BNEdBM\
+      FdOaE1CNFhEVEl4TVRBeE5ESXlNRGd3TkZvWERUTXhNVEF4TWpJeU1EZ3dORm93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU85R1JBK2JmQVoyCldtNEt0UDE0ODlBb1FKTW5vMzdtTmowaXFVcGlybU0zTXVJUklTRXk4c\
-      2h1cnhUTlRla2ZYU3d1UDNwdVRlZmIKeGh3ZG9WcDlXby9RZnB3WHg3UkIxajdYK25STmY3eE90b\
-      zlEVWd4Z1hQbFFZTmwvTFdxejBONWRmS1YzaXJvcQp2WVVpeVFhOWdWeUFXZGVYREZBWWhXMzg4b\
-      i96OUx0eUs0bWdzd1lPeVphSXNsSGNFWjdheXYzTmtvNzZRL1JjCk5RVXVRaUNlaWhGSEIxNSttb\
-      EFrR1FraUkxRUpCZWFQY0lqTXVOSU9hcUQ2R3krTUQxaFJFcWNwTUtXVEgxc0YKMi9LMTRsYXhKW\
-      GE0RWkzZ0N3SDJCaWVHVWNvZ1ZyNFNROHZReU05alYyL2RnQllzR09aVVM5ZHB5ZzVVUjZpMgpTR\
-      lpWTTVoZmFhMENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBTHBIc2o5azVjVVlCSDg2aGlJTHpKL\
-      1BzRUZoUmgyMXJCRUUKUFRvQ2RGaldpL3NkMWhlVWtwL2VTTzRWa1IzUklCMkhDWEovSzFrR0xSd\
-      3BUV1NBZ0RsbW9WVWZnU3JCVHZ4aQplQ3EzNmo2OGtpZUNydEgyR2RsRm9EbUR4MmJpaWg2MGZEZ\
-      U5NTU15WE9Ed3RoZWtaR28wdHhHQmRTNjBQbEdNCkQ0bys3eTJ1UzIxZVNiSEYrN0ZVeHhQQk83R\
-      DFLOGYrYTdpNWx2VExMYmplUVNNVFJWVkN5ZmVBYUFoRWFnUUEKd0J3QVhpNW9TS21vVWlOc0ZCV\
-      FNwTVRaZGpXdHhsMHhsRTRhaDJYaUZzUTF6WWpIK29mSllnRmkzQ1ZoU3UvVQpDdHU1eUtjVFdaT\
-      zA3Sk9zamtiWTRNb2piaklCaUpOelpGaEI2dGI4YkRNTFdSR1MxMmc9Ci0tLS0tRU5EIENFUlRJR\
+      0VCQUtvYm4rc2NXVWFBCm12QWNOeVh1eUh1OTZGS2JMYlVWT1hiOGpPeDJyTGxRSS93aW5tTUJ2a\
+      FNBeWQ1ZHJJRWhYNEsraVBlMEVEUjAKaEVHVllEV052MFVZdjMvM0U1TG9DWXlrTHNsMFh2YW50U\
+      EdhdHN2Y0Y4eVFjcUVENGZ3OUVVSldtRFRIdzI3TQowTTNwR0lrMlU5UUNWSVUrTFpzMFhnOHk4d\
+      UFGTjNkMGhrSmxDK05xb1J5b0tTZ3lRV1dZRzhlMkxNZURob21JCnYxb1pKbXFWVjY2eUhwOVFCQ\
+      09TdWppdXcyUnRxVjRSTk9yZ1Nkbk1oWFl4eU5yZndlR0lXUmlwSTg2c2toWmsKZ051anVRdmYwT\
+      ExSR215d1JUZ2JXSzZtYis4OXFWeUx5Q2h2Ly93Yi9XK1Y5SXpoZnBnbExDem5SS1RNSGNiNwoyb\
+      HllZ1U4eFF2TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ2ZlbXBtbkNpNVMyWmh5NGF5MnZTd\
+      jVjZi9TNDQwZHhRUlcKVE5RcTc1alQ1YlJjUkR0bmhHeXJIbE1wUVFsL2hpN1JwbmhkTVA2SGZpe\
+      FdmKzdsNU41dXNEZnNzQkxJQi9KNAo1WVFZMWVLVnNFT2dBN3pMMXFPMkFFeDNCRGRSYU9BWmpLR\
+      ldhMjB6b3h3MnoySHFRN0FvUlUvdUZuSG1GOVpLCnkyMUMyd2M4NkFPUjRIT2s4TW1yM25rSWVPT\
+      m9ZZmR3V1RsVDRRUmVaVDZrWTAzeEIvd205VllTYnBVcHE5NksKcHI1aTFrdStLN05wa3hMSUgvZ\
+      GJSM0Q1R2hTK1ZtK3R3Vm01czZ6MzdFNEZkVHBTYzIyNDMxQ1dZb1pyK2lwTAowSVk3MXNaUXBnc\
+      DU2ZzhibjRQeFZPTTFKSTFJb1NlMFFJemF2cndTckd4SFV5WmRpckU9Ci0tLS0tRU5EIENFUlRJR\
       klDQVRFLS0tLS0K"
 
 users:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-bqnq8:r5zxqhf8cwqs6pqlt2k82xjngqkcpslwk2glmlzqf42d6hmctl879q"
+    token: "kubeconfig-user-cvpsj.c-lvptp:cc8crmhkp62ch2xw9xth46bt6hzgzlzbxkfn2f6cj4m7jkjcwfnpv4"
+
 
 contexts:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   context:
-    user: "onf-flex-pod"
-    cluster: "onf-flex-pod"
+    user: "voltha-flex-pod"
+    cluster: "voltha-flex-pod"
 
-current-context: "onf-flex-pod"
-
+current-context: "voltha-flex-pod"
diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.conf b/kubernetes-configs/flex-ocp-cord-voltha-master.conf
index 434be54..f548642 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.conf
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.conf
@@ -1,19 +1,39 @@
 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: "voltha-flex-pod"
+  cluster:
+    server: "https://10.93.1.10:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl4TVRBeE5ESXlNRGd3TkZvWERUTXhNVEF4TWpJeU1EZ3dORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQUtvYm4rc2NXVWFBCm12QWNOeVh1eUh1OTZGS2JMYlVWT1hiOGpPeDJyTGxRSS93aW5tTUJ2a\
+      FNBeWQ1ZHJJRWhYNEsraVBlMEVEUjAKaEVHVllEV052MFVZdjMvM0U1TG9DWXlrTHNsMFh2YW50U\
+      EdhdHN2Y0Y4eVFjcUVENGZ3OUVVSldtRFRIdzI3TQowTTNwR0lrMlU5UUNWSVUrTFpzMFhnOHk4d\
+      UFGTjNkMGhrSmxDK05xb1J5b0tTZ3lRV1dZRzhlMkxNZURob21JCnYxb1pKbXFWVjY2eUhwOVFCQ\
+      09TdWppdXcyUnRxVjRSTk9yZ1Nkbk1oWFl4eU5yZndlR0lXUmlwSTg2c2toWmsKZ051anVRdmYwT\
+      ExSR215d1JUZ2JXSzZtYis4OXFWeUx5Q2h2Ly93Yi9XK1Y5SXpoZnBnbExDem5SS1RNSGNiNwoyb\
+      HllZ1U4eFF2TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ2ZlbXBtbkNpNVMyWmh5NGF5MnZTd\
+      jVjZi9TNDQwZHhRUlcKVE5RcTc1alQ1YlJjUkR0bmhHeXJIbE1wUVFsL2hpN1JwbmhkTVA2SGZpe\
+      FdmKzdsNU41dXNEZnNzQkxJQi9KNAo1WVFZMWVLVnNFT2dBN3pMMXFPMkFFeDNCRGRSYU9BWmpLR\
+      ldhMjB6b3h3MnoySHFRN0FvUlUvdUZuSG1GOVpLCnkyMUMyd2M4NkFPUjRIT2s4TW1yM25rSWVPT\
+      m9ZZmR3V1RsVDRRUmVaVDZrWTAzeEIvd205VllTYnBVcHE5NksKcHI1aTFrdStLN05wa3hMSUgvZ\
+      GJSM0Q1R2hTK1ZtK3R3Vm01czZ6MzdFNEZkVHBTYzIyNDMxQ1dZb1pyK2lwTAowSVk3MXNaUXBnc\
+      DU2ZzhibjRQeFZPTTFKSTFJb1NlMFFJemF2cndTckd4SFV5WmRpckU9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
 users:
-- name: admin-cluster.local
+- name: "voltha-flex-pod"
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQUpXVWoyejlRelBUTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt3TWpJeU1qRXhNalEzV2hnUE1qRXhPVEF4TWpreU1URXlORGRhTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXFaMk9lZ20xSDhzSklrOHUKck9nTUsrYXhuV21LUktaYUZPdit6QW9MVk14R1JXZU9xWWVjUUhudmJQRGk1ZlZwSmRlQnhjS3pVTUNEMnNRaApRdHF0TnVjbXJRNE4zWXBWdDVFamdGeFhjVWFobnpDNDZVZnhYRDN1cVE1VGJDVVRLcUlkamhjZzJkUEFTbHY1ClFlK3BZbHEwQ1RmKzVrTmhmcE1NaUlkWGZ5US9PMDNERldqQW1uUmtOSmtOSXNRMW9aTUhyWU9UM2hTM1pQQ2sKUDEvSHBMSHRIRFpBQVpiV0lJa2s5bmRjRk94aEl4WlZnelUrL0ozdVM2bmhDUERuSEFhdHZRMmFwWmVQMk96QgpkVDFFMHVFZmQzb1prcTREYUUyVDd5L2ludU13aWEyeUo5MW5DeDkyS3ZiQzJpazlMNERoQjFDYjNjTFMxZklVCkQ2QTBSd0lEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBckFGQzJIQkFyQUZDNkhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFFZGREMTFLa2hoSVFIR3kxanRwM0tMTjVxeWpCa3RDNjliMTFzVUY1SkwrVTBBYjNPVm5FdnVwCm1TVGthbnRzMmxFVUZaVUpQcTN2WnE5UUkyQXlHR1hvTUw1eGJ3eEp4eDR3WFBWbHlNUXloMVdoZmNnQll6Z0UKVzhtUEM3OGlvZEdDUnU3N3hkUHFkNC9TdVJiYnBQdVNSc2psM1FaUUErcC9Ub2RPWDlIWEpVbktDTGl3TEJWNwpWc1gxZCtKVVJmS2c0NlFIRUxKcldoMDVaTHZaeGpXekxJNDROdG1OMEVKaWZ4YWY3Lzd0K3llQlo4NHlObFZKCmhINllSK0ZzTUp0UU5nTy9VVURsVkxTMzlad1BCL1RGcUk3bStqUFQ1RHVYMUY3RmdWYzdVNWJiWFVybTRiRncKSGJCcnRlZ3Y4b0NOQmJiaURmTDh4UUQ0eU1WZkdkOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBcVoyT2VnbTFIOHNKSWs4dXJPZ01LK2F4bldtS1JLWmFGT3YrekFvTFZNeEdSV2VPCnFZZWNRSG52YlBEaTVmVnBKZGVCeGNLelVNQ0Qyc1FoUXRxdE51Y21yUTROM1lwVnQ1RWpnRnhYY1VhaG56QzQKNlVmeFhEM3VxUTVUYkNVVEtxSWRqaGNnMmRQQVNsdjVRZStwWWxxMENUZis1a05oZnBNTWlJZFhmeVEvTzAzRApGV2pBbW5Sa05Ka05Jc1Exb1pNSHJZT1QzaFMzWlBDa1AxL0hwTEh0SERaQUFaYldJSWtrOW5kY0ZPeGhJeFpWCmd6VSsvSjN1UzZuaENQRG5IQWF0dlEyYXBaZVAyT3pCZFQxRTB1RWZkM29aa3E0RGFFMlQ3eS9pbnVNd2lhMnkKSjkxbkN4OTJLdmJDMmlrOUw0RGhCMUNiM2NMUzFmSVVENkEwUndJREFRQUJBb0lCQUVKdVZ4TXRJaWRsbWhvNQo4UW4vaUdUWlljOUpPc0pRZFEra3JwS3pqR1NWN1IvWncySmFuclFTRGRnWk1JVG9iVnBJNGFiVzd1dzl1bWJBClVsYWcxeDZkd2VRZGtRaW4yWktmNGN1d1h2OGFyc3B1aHIyM1U2elJCTnhwby9yRE9wS0VGQmRHcjdNZzREcy8KY295RWxVN1VQNWNzdTBUc053OGdBTlNvVFhpWjBuQ3JRbWlrNCtBRWRiQ2JlM2ZFb0hpS3dVMFRaL1BlU0UxcQp5TndEc0x2UnluM3RTZHlBdzVYK3lUaGxtZ0FjSytMVmRpNWRRNzgvaFdCZit2Sytoc3EyVGtpQ0JZa2V2cjh2CkZZYjZOQ3c5T0licW14bk1YRko1cnRaMElseC9qQ3gwUEU1OUVHQ0hyNW56d3BJYk1PVHB0cmtmQXlKU1F0bnAKRDE1OVRTRUNnWUVBMWczaGp6dkp3ZW9zUUVncmxMUFBUdFcxd1BwcUNJWW56L2dBV2VOT05jS0VPN0J1U1YwNgpCblU1YzhFZk9ESFNDRGN6ZDZuQURIMWpJdEpFL1JxZk5VYW9RaWM2V3Z2bTluUVNUbTJnRmJLek5aRU1hdk4vCkFpVGladWZ4OUVmcy9Ocm82d3ppc0lUa0RxSVBZbEJtQVhBTTlOd3V3OXBrVm5wY28wYURVYXNDZ1lFQXl0cGkKNEdTS0FXUnduYUV0QUQxOHNzMkIrdkZKbXpxQVQ0MU5Rc0I1OXc5R0FWOFkxS3lpWXJEcHBxODdlT3lUZHpYKwo4UjY0S0lTejA3dTVicndvV1dCRTFwZkc1cXIyc2IvK0wvS0RRdTI5U1FHUXBpa0YybURYSit1bFA1ajNvYUZ3Cm9qZFVrTTcvaGEybkVBMmlmWWcycGlCTnVZVlVkZTdmbHo5NHc5VUNnWUJxWlNYcmF2MWkzSUc0UmVjYmw3Q0EKYit0U2kyV3U3UGZYQUY4MFRxNXVQRXc3MnZ0R2pnY3NkSkhrL21ZRktZWkxQUnpnNnNnaHJTVmNob1Z5QlF5RApqNlpNazNFSERsU0R4YmZmc2MreldVcUlZcHQ0Z2FWc3JHYTRYYXUvRHcwMXRaMjJUNFpSMVF3Q1ZmMHRrZWJSCjZoOFdpbWJZUkxKQTVic3NFUDF1MXdLQmdBNlFLU01VOUxkdTM0cmhoRnFORDRQQ3J6ODF6V1FBaWkrcjVFMFQKaG00UFFhWmRqbW5PVHdZb3owMXhMU0xjVVNYdzBYRzhFOXFNMUdBeURQai9OeUpiZi9Xc0JkS1BtWkJmU1Q5bAorTGg0V3V0LzJrT2psRkQrUE5RWDNkQTRDaWNuY08ra2EwVE9KNWdRUkhzcGoyM1Z0cDZzbVFmbG80K242NU52Ck1odFZBb0dBWW80cHpsd3l0Mndaam9uaUlaN0J6ZkgvQTFobHhpY3h2eU1lRzJjZlAyTHZsM1VZTmc2UEZHd1UKWHZHRzdOUTlFN2FtSmpTWjN4M2FWTDBJZTVtUkpldjFMSFYyVmdOU3hvS0hKeEtBb3dwM2l3VE0rd1loUE9sTApPMXRjV1pYa2kxZkVzbFRRNzkwVkV1Snc4QzJyZVQydWJGaXhkN3YrOWttVjk4YXVKbms9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+    token: "kubeconfig-user-cvpsj.c-lvptp:cc8crmhkp62ch2xw9xth46bt6hzgzlzbxkfn2f6cj4m7jkjcwfnpv4"
+
+
+contexts:
+- name: "voltha-flex-pod"
+  context:
+    user: "voltha-flex-pod"
+    cluster: "voltha-flex-pod"
+
+current-context: "voltha-flex-pod"
diff --git a/kubernetes-configs/flex-ocp-cord.conf b/kubernetes-configs/flex-ocp-cord.conf
index afd5637..f548642 100644
--- a/kubernetes-configs/flex-ocp-cord.conf
+++ b/kubernetes-configs/flex-ocp-cord.conf
@@ -1,39 +1,39 @@
 apiVersion: v1
 kind: Config
 clusters:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   cluster:
     server: "https://10.93.1.10:6443"
     certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
       WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl4TURJeU5ERTNNall5TVZvWERUTXhNREl5TWpFM01qWXlNVm93RWpFUU1BNEdBM\
+      FdOaE1CNFhEVEl4TVRBeE5ESXlNRGd3TkZvWERUTXhNVEF4TWpJeU1EZ3dORm93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU85R1JBK2JmQVoyCldtNEt0UDE0ODlBb1FKTW5vMzdtTmowaXFVcGlybU0zTXVJUklTRXk4c\
-      2h1cnhUTlRla2ZYU3d1UDNwdVRlZmIKeGh3ZG9WcDlXby9RZnB3WHg3UkIxajdYK25STmY3eE90b\
-      zlEVWd4Z1hQbFFZTmwvTFdxejBONWRmS1YzaXJvcQp2WVVpeVFhOWdWeUFXZGVYREZBWWhXMzg4b\
-      i96OUx0eUs0bWdzd1lPeVphSXNsSGNFWjdheXYzTmtvNzZRL1JjCk5RVXVRaUNlaWhGSEIxNSttb\
-      EFrR1FraUkxRUpCZWFQY0lqTXVOSU9hcUQ2R3krTUQxaFJFcWNwTUtXVEgxc0YKMi9LMTRsYXhKW\
-      GE0RWkzZ0N3SDJCaWVHVWNvZ1ZyNFNROHZReU05alYyL2RnQllzR09aVVM5ZHB5ZzVVUjZpMgpTR\
-      lpWTTVoZmFhMENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBTHBIc2o5azVjVVlCSDg2aGlJTHpKL\
-      1BzRUZoUmgyMXJCRUUKUFRvQ2RGaldpL3NkMWhlVWtwL2VTTzRWa1IzUklCMkhDWEovSzFrR0xSd\
-      3BUV1NBZ0RsbW9WVWZnU3JCVHZ4aQplQ3EzNmo2OGtpZUNydEgyR2RsRm9EbUR4MmJpaWg2MGZEZ\
-      U5NTU15WE9Ed3RoZWtaR28wdHhHQmRTNjBQbEdNCkQ0bys3eTJ1UzIxZVNiSEYrN0ZVeHhQQk83R\
-      DFLOGYrYTdpNWx2VExMYmplUVNNVFJWVkN5ZmVBYUFoRWFnUUEKd0J3QVhpNW9TS21vVWlOc0ZCV\
-      FNwTVRaZGpXdHhsMHhsRTRhaDJYaUZzUTF6WWpIK29mSllnRmkzQ1ZoU3UvVQpDdHU1eUtjVFdaT\
-      zA3Sk9zamtiWTRNb2piaklCaUpOelpGaEI2dGI4YkRNTFdSR1MxMmc9Ci0tLS0tRU5EIENFUlRJR\
+      0VCQUtvYm4rc2NXVWFBCm12QWNOeVh1eUh1OTZGS2JMYlVWT1hiOGpPeDJyTGxRSS93aW5tTUJ2a\
+      FNBeWQ1ZHJJRWhYNEsraVBlMEVEUjAKaEVHVllEV052MFVZdjMvM0U1TG9DWXlrTHNsMFh2YW50U\
+      EdhdHN2Y0Y4eVFjcUVENGZ3OUVVSldtRFRIdzI3TQowTTNwR0lrMlU5UUNWSVUrTFpzMFhnOHk4d\
+      UFGTjNkMGhrSmxDK05xb1J5b0tTZ3lRV1dZRzhlMkxNZURob21JCnYxb1pKbXFWVjY2eUhwOVFCQ\
+      09TdWppdXcyUnRxVjRSTk9yZ1Nkbk1oWFl4eU5yZndlR0lXUmlwSTg2c2toWmsKZ051anVRdmYwT\
+      ExSR215d1JUZ2JXSzZtYis4OXFWeUx5Q2h2Ly93Yi9XK1Y5SXpoZnBnbExDem5SS1RNSGNiNwoyb\
+      HllZ1U4eFF2TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQ2ZlbXBtbkNpNVMyWmh5NGF5MnZTd\
+      jVjZi9TNDQwZHhRUlcKVE5RcTc1alQ1YlJjUkR0bmhHeXJIbE1wUVFsL2hpN1JwbmhkTVA2SGZpe\
+      FdmKzdsNU41dXNEZnNzQkxJQi9KNAo1WVFZMWVLVnNFT2dBN3pMMXFPMkFFeDNCRGRSYU9BWmpLR\
+      ldhMjB6b3h3MnoySHFRN0FvUlUvdUZuSG1GOVpLCnkyMUMyd2M4NkFPUjRIT2s4TW1yM25rSWVPT\
+      m9ZZmR3V1RsVDRRUmVaVDZrWTAzeEIvd205VllTYnBVcHE5NksKcHI1aTFrdStLN05wa3hMSUgvZ\
+      GJSM0Q1R2hTK1ZtK3R3Vm01czZ6MzdFNEZkVHBTYzIyNDMxQ1dZb1pyK2lwTAowSVk3MXNaUXBnc\
+      DU2ZzhibjRQeFZPTTFKSTFJb1NlMFFJemF2cndTckd4SFV5WmRpckU9Ci0tLS0tRU5EIENFUlRJR\
       klDQVRFLS0tLS0K"
 
 users:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-bqnq8:r5zxqhf8cwqs6pqlt2k82xjngqkcpslwk2glmlzqf42d6hmctl879q"
+    token: "kubeconfig-user-cvpsj.c-lvptp:cc8crmhkp62ch2xw9xth46bt6hzgzlzbxkfn2f6cj4m7jkjcwfnpv4"
+
 
 contexts:
-- name: "onf-flex-pod"
+- name: "voltha-flex-pod"
   context:
-    user: "onf-flex-pod"
-    cluster: "onf-flex-pod"
+    user: "voltha-flex-pod"
+    cluster: "voltha-flex-pod"
 
-current-context: "onf-flex-pod"
-
+current-context: "voltha-flex-pod"