diff --git a/kubernetes-configs/flex-ocp-cord-voltha-master.conf b/kubernetes-configs/flex-ocp-cord-voltha-master.conf
index 2b28c63..54fb4ce 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.conf
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.conf
@@ -1,30 +1,19 @@
-[all]
-node1 	 ansible_host=10.192.20.45 ip=10.192.20.45
-node2 	 ansible_host=10.192.20.46 ip=10.192.20.46
-node3 	 ansible_host=10.192.20.47 ip=10.192.20.47
-
-[kube-master]
-node1 	 
-node2 	 
-
-[kube-node]
-node1 	 
-node2 	 
-node3 	 
-
-[etcd]
-node1 	 
-node2 	 
-node3 	 
-
-[k8s-cluster:children]
-kube-node 	 
-kube-master 	 
-
-[calico-rr]
-
-[vault]
-node1 	 
-node2 	 
-node3 	 
-
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1ESXhPVEl6TXpJeE9Wb1hEVEk1TURJeE5qSXpNekl4T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTWsrCkNHclBSV0ZpMWVPVjdORHBkQ01CRWxhVG9Pdkl2MUZhWHVESkxmRmRCamJ1dkxMZTJPWThTZEFpUm5QOThjWWEKMGxqV01ETGVKT0JJaUlxVVJLalR0SWRxMzE5KzZiSXVOMUduSmJZaU1tRG1vS3JpSWZBczNLck1LREVVMWFiQQpJSU1iZWMzYjAvMGhEcVhYNSswRWJQcVF6Wk14SGRvWmZDWm1XQmF1Tm45bEVJTGF5SUNsem9sSFRRZGE0bXRsCnpqcFF4VVJhWFdaU1NJbnlQcnpjMnhaYVFJOE1iclRHN2daUVJnY1hDQ1AxYXJ0b2M2c3A4VFdCVk9IZ3BYMjYKSG9pbFVqbVRPazIxNisrQXRQZzN4YUlIYXFXNkJkZEE4YzNFUWZ0d3BLUkdtZHlYTThGQ0NSazE0dk5jUmdaQwpZamUyMDhFV042SWZQM0pNV3hVQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNQWFZVzhmNTg5bU9MajFITzBxdTJRemVqQm8Kbkk5bVhaWlkvdDY1ejF2eUl3aHhacGN0VEcramVVWTZydmNoQ1pNUG12ay9qSklMTlc4OUJzU21IVkUwdWlBegoyMEFKbXpTOElENzQyZ0JyVVBOdFdmUUFuUHJROWlDSWNpYzVmN21ScTFBRWEyQW5tdS9ZV081ZE45anJmYjJ1CnVIbmRzUHFVRzlUWWx3Ull3ZkxJQWFwYStWbndSMFo5ODd6bFNORElxbHFEU1RWSzEram1TS2Z4UkRTeUlabngKeldpZWJZbEV0ZWd0U3IvanU0V2hTZDVibDJtUGJnNWNIaVc5ZjBaZXh2RW5Dd2tSTUJGWXZJb1gzeFkwUERodQpoZnJJYjJHeWZEaEU2d3pjcFIrQVA1OTJLM2NvTURON1ZEWnBqN3JzRWlMN0tKV3c4QmdPRVVuR3Z3az0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.192.20.45:6443
+  name: cluster.local
+contexts:
+- context:
+    cluster: cluster.local
+    user: kubernetes-admin
+  name: kubernetes-admin@cluster.local
+current-context: kubernetes-admin@cluster.local
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJRDRHeW5VdS9RbHN3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBeU1Ua3lNek15TVRsYUZ3MHlNREF5TVRreU16TXlNakJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTVrSTFXNytRRHVLZXNibEgKa0xOZXJrekQ3ZnUyT1loYk5RaHIxZFJaWlFRcytoZDJVODlSZE9lb04vZ2Q0bmNud016RWdLTUVZcVhXYkxXYQo1RTBuRHBBRjQxQ3ljalVkdVVKNk5JUS9GN2tsbkxHcGJqMFZna2xDSFFYN04wZUtkaEtvUXc4R1BnQlNVSnA0CjNzU0VHTHNCM2ZpdHlBVXNhNm9WTnRSbnpGcC9TcVJvUGZqV1lGU2w5R3AwVWxMZlNmeHN5d0w0R1RpYW0xRmoKMzVQODVkZVdmWW9PU0pUNnlDUmhMODF5WDJuQ09OQ21VU0pSdVhycVJ3c05ueCtlVFNzZ0phLzJaaVhhSDBKOApQRFNxS2ZQQXhyZEFvSXBCVWpLTTAzaUVFeVRvWE0zS1pIcUpGV2VsdUF2UjAzTnZkaTdzaENySUJDd1FDTXp6ClBDczFWd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFLb3BSUXFqcFVvSjJLWTZtOEx2MVEwZFZQQlZMTStzSnVrUQptSW8zU2MwM2ZvdWZjS3JaYnhYNnJCNjJ4Tm1ZTHpsMzBOQThmSGdoWERIV3RUQTZ0Q1pQSzF0ejdOTEplZWtrCklUemh6bHhSdTlpNjJmeTQzMGtKaUdOZEt3eFgzeUZLMGg4U0R4QW16WFJFendDNVRhYXlCOW84bU40MzhsTXIKcGRweFVHZSt1WjFtRG5NUlp3UlVTeFQ2V1JYMWNSV3NNeXZhSWl2UXJXRnlsQmhFbWx6S2d5Wm96YTBXUUVmNQppcFNHVE8rWmxiaHVkWGlBTldKc0lLeFVjVzZFODVsckNIMThiUXgzUDRsMjAyMGNoTVRGV1l3eWFSMTNMd1BNCkxUWkc1MXlDTFI4bmxURndhL09tUmVLZDJZTXdkVnZaR0J5ZTc3aUllZUxzc1BFMnB6ST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBNWtJMVc3K1FEdUtlc2JsSGtMTmVya3pEN2Z1Mk9ZaGJOUWhyMWRSWlpRUXMraGQyClU4OVJkT2VvTi9nZDRuY253TXpFZ0tNRVlxWFdiTFdhNUUwbkRwQUY0MUN5Y2pVZHVVSjZOSVEvRjdrbG5MR3AKYmowVmdrbENIUVg3TjBlS2RoS29RdzhHUGdCU1VKcDQzc1NFR0xzQjNmaXR5QVVzYTZvVk50Um56RnAvU3FSbwpQZmpXWUZTbDlHcDBVbExmU2Z4c3l3TDRHVGlhbTFGajM1UDg1ZGVXZllvT1NKVDZ5Q1JoTDgxeVgybkNPTkNtClVTSlJ1WHJxUndzTm54K2VUU3NnSmEvMlppWGFIMEo4UERTcUtmUEF4cmRBb0lwQlVqS00wM2lFRXlUb1hNM0sKWkhxSkZXZWx1QXZSMDNOdmRpN3NoQ3JJQkN3UUNNenpQQ3MxVndJREFRQUJBb0lCQUVpM2xoUlFqaFUxV25xMApFYmJQL3RHNjZwR0kwY2FmbW5aSUg0NGJEdFJKR2s4dEE3QjZJN1p3eG41T2ZGbWQyYzhZbStJb0dXVnlEQ0t1Cnc2amYrTHF2bnp4bnFzTklwUWR4eUJnM3Y1a2xYb3g2eXhCR2VEbDZHMGdCTUpJSHBPR2ZDTWFNd3lMbmhSZHgKZ1VTUStVcTZIRi9XZmtOUjV2SmxkMmVtY3RWbEVhNWRQUWpxeGRoY053VURtdGN4TXpkcXlCZloxRlp2aDBERgo1cnNrb1hEU0tYTlFxUVY3dHZFSWZ3ZkNpU09LUHF2aGlueFlsRk1PUVU5YjZLSWVTVUF0a1ExQkR6WG9NWnJSCk1jMzA5Z3d6Y0ZLZ1BaOEVUMnVVanl4enhSTHN2WDRFcTNMODhRaHQwWC9xWGlUaTYvZ3huN2RZVzMrT3JjMWUKWUdjRjlya0NnWUVBK2RSeE80L2oxMUhGMkk1TkRibm8vN1g0RC95TWVSbGdLU3lLcm9icFpycmVzVHJwbmtFbApjd2tIb2pGajFmYmpNcEk1TjlMRmJkZzk4N3MvVFN4RVYyNDAxMTZURGVzVFRVekhWdGdCVStIZlNCK0UwU2JICmdiN1pObWJwOXQxYVVDdkE4S0JDVlBtdERudGtrS3plMCtFaER6UC9NZ2wzQ2ZIMjdhNlhBbU1DZ1lFQTYvSUcKd0xKODNIdnBNSnQ2cHVxWG9pVjV6OHJ3VFpnMU1IUjJ5VkpYWXNnY3VacTNpZVFHMG1pWk5zVisvRnB1d3J1Zwo0NnAra3lvbFdLTDEwWkVpLy9FU2kyTUNlM2xDOTltN1VpREVtUXdQVWNDQ1gzUmt1Z0xMSERRTE9WbzdpdUszCk52VlU3N1FYWWlwREtnNEQxTUFFT3U4ZlpGc3V4RStDSUVDdE9YMENnWUJjNFdON25tSTVrZmc1SzZadi9QY24KNGxJb04xOU9RbVhpeU9HQ1F6d1E2bGFTazNGNVdZVC93SktxOVN2RngzVHVQeml3alZiRElNcmZpM1RjVHlIVgpVMjZueDB4cXQwUEUwRStuOU1TQm1BNzM5R2ZmamtoTDcxVTRDWWpnTTZrNDl4dFRHbkd1ditoYjR2b2ZZM1d3ClZobUJXblo4OXRIZnk2cGU4VExKT3dLQmdRQ1dXTzRtb2xYZ0pYRk5rUFdTSVZDb2VScnE1eFZEVEtjd0RqYVgKU01uNFh5MjJzN2thdTl3QS9iZ0w1OE5vU0xQbGtLd1FCdGVMTFVNSS9TYUkrT1FGbFhkTXJMV3JPblVLL0lwWgo1aG1Bc09lZUgzNjBGcllNdGJUNWJzeHNLbXhncnVFeXV4ZjVlcGVmN1BCSmZ3Ni81ZStNSWsydHBGRGp0UXBsClJQRmMvUUtCZ0N2am9RWGVPdVJ2Yld4NUZZMXo1dTQ3Vk1IemJ5amJTMzl4SEdIWS8wZ2pEcVkzNFdFaU1kV3oKSVAwM245S3JZQWdQMHhJTEFJa2p6eVp6L3Qrcndaa29EQ3pMcS9UeGtnRDV5N0FLSzYwcnp4NFkwVHVISi9iRQpQVkduMkhzSis3MUY2R3BsSUsrS1d4SHpjOVU2Z1AyTUhSWVh3aUZYZFJyRm5YdFFRZFluCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==