diff --git a/Jenkinsfile b/Jenkinsfile
index 5aa5f56..cb14866 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ def registerCluster(){
     def release_name =  "${helm_chart_name}"
     def values_file = "values_" + "${helm_chart_name}" + ".yaml"
     echo "Deploying release ${release_name} on cluster ${params.K8S_CLUSTER} in namespace ${env.NAMESPACE} using values file: ${values_file}"
-    withKubeConfig(caCertificate: '', clusterName: env.K8S_CLUSTER, contextName: env.K8S_CLUSTER, credentialsId: env.K8S_CLUSTER.toLowerCase()+'-jenkins-token', namespace: env.NAMESPACE, serverUrl: env.K8S_SERVER_URL) {
+    withKubeConfig(caCertificate: '', clusterName: env.K8S_CLUSTER, contextName: env.K8S_CLUSTER, credentialsId: kubeconfig, namespace: env.NAMESPACE, serverUrl: env.K8S_SERVER_URL) {
     sh label: '', script: """
         kubectl config set-context --current --namespace ${env.NAMESPACE}
         ${HELM_HOME}/linux-386/helm repo add eai-tibco-platform https://tibcosoftware.github.io/tp-helm-charts
@@ -37,7 +37,7 @@ def configureNamespace(){
     def release_name =  "${helm_chart_name}"
     def values_file = "values_" + "${helm_chart_name}" + ".yaml"
     echo "Deploying release ${release_name} on cluster ${params.K8S_CLUSTER} in namespace ${env.NAMESPACE} using values file: ${values_file}"
-    withKubeConfig(caCertificate: '', clusterName: env.K8S_CLUSTER, contextName: env.K8S_CLUSTER, credentialsId: env.K8S_CLUSTER.toLowerCase()+'-jenkins-token', namespace: env.NAMESPACE, serverUrl: env.K8S_SERVER_URL) {
+    withKubeConfig(caCertificate: '', clusterName: env.K8S_CLUSTER, contextName: env.K8S_CLUSTER, credentialsId: kubeconfig, namespace: env.NAMESPACE, serverUrl: env.K8S_SERVER_URL) {
     sh label: '', script: """
         kubectl config set-context --current --namespace ${env.NAMESPACE}
         echo "Applying DataPlane Label"