diff --git a/setup-helper.sh b/setup-helper.sh
index 30731ed..82d293d 100644
--- a/setup-helper.sh
+++ b/setup-helper.sh
@@ -144,7 +144,7 @@ read_email() {
 
 confirm() {
     declare prompt="$1"
-    
+
     read -p "${prompt}Press enter to continue. Press any other key to stop." -n 1
 
     [[ -z $REPLY ]]
@@ -169,7 +169,6 @@ is_rzp_email() {
 oidc_exists() {
     declare email="$1"
 
-    declare template="{{\$res := 0}}{{if .users}}{{range .users}}{{if eq .name \"${email}\" }}{{\$res = 1}}{{end}}{{end}}{{end}}{{\$res}}"
 
     [[ $(kubectl config view -o=go-template --template="${template}") == 1 ]]
 }
@@ -213,7 +212,7 @@ configure_helmfile_for_werf() {
 }
 
 install_kubelogin() {
-    brew install int128/kubelogin/kubelogin
+    brew install Azure/kubelogin/kubelogin
 }
 
 cluster_config() {
@@ -233,22 +232,19 @@ cluster_config() {
 }
 
 oidc_config() {
-    declare email="$1"
-    declare oidcIssuerUrl="$2"
-    declare oidcClientId="$3"
-    declare oidcClientSecret="$4"
+    declare serverId="$1"
+    declare clientId="$2"
+    declare tenantId="$3"
 
-    oidc_exists "$email" && return 0
+    oidc_exists "azure" && return 0
 
-    kubectl config set-credentials "$email" \
+    kubectl config set-credentials azure \
         --exec-api-version=client.authentication.k8s.io/v1beta1 \
-        --exec-command=kubectl \
-        --exec-arg=oidc-login \
+        --exec-command=az-kubelogin \
         --exec-arg=get-token \
-        --exec-arg=--oidc-issuer-url="$oidcIssuerUrl" \
-        --exec-arg=--oidc-client-id="$oidcClientId" \
-        --exec-arg=--oidc-client-secret="$oidcClientSecret" \
-        --exec-arg=--oidc-extra-scope=email
+        --exec-arg=--server-id="$serverId" \
+        --exec-arg=--client-id="$clientId" \
+        --exec-arg=--tenant-id="$tenantId"
 }
 
 setup_tools() {
@@ -280,26 +276,21 @@ setup_tools_only() {
 }
 
 e2e() {
-    declare oidcIssuerUrl="$1"
-    declare oidcClientId="$2"
-    declare oidcClientSecret="$3"
-    declare contextName="$4"
-    declare clusterName="$5"
-    declare clusterUrl="$6"
-    declare cadata="$7"
-    declare spinnakerHost="$8"
-    declare accessWebhook="$9"
-    
     confirm "Starting setup for devstack:${DOC_BASE}${DOC_TOOLS}${DOC_ACCESS}"
 
-    test_private_connection "https://${spinnakerHost}"
+    test_private_connection "https://{{ ENV['SPINNAKER_HOST']}}"
     read_email email
 
     setup_tools
 
-    oidc_config "$email" "$oidcIssuerUrl" "$oidcClientId" "$oidcClientSecret"
-    cluster_config "$contextName" "$clusterName" "$clusterUrl" "$cadata" "$email"
-    spinnaker_webhook "$spinnakerHost" "$accessWebhook" "{\"user_email\": \"${email}\"}"
+    oidc_config "{{ENV['AZURE_OIDC_SERVER_ID']}}" "{{ENV['AZURE_OIDC_CLIENT_ID']}}" "{{ENV['AZURE_OIDC_TENANT_ID']}}"
+    #set dev-automation cluster config
+    cluster_config "{{ ENV['DEV_AUTOMAITON_CONTEXT_NAME']}}" "{{ENV['DEV_AUTOMAITON_CLUSTER_NAME']}}" "{{ENV['DEV_AUTOMAITON_CLUSTER_URL']}}" "{{ENV['DEV_AUTOMAITON_CA_DATA']}}" "$email"
+    #set dev-stack cluster config
+    cluster_config "{{ ENV['DEV_SERVE_CONTEXT_NAME']}}" "{{ENV['DEV_SERVE_CLUSTER_NAME']}}" "{{ENV['DEV_SERVE_CLUSTER_URL']}}" "{{ENV['DEV_SERVE_CA_DATA']}}" "azure"
+    spinnaker_webhook "{{ ENV['SPINNAKER_HOST']}}" "{{ ENV['ACCESS_WEBHOOK']}}" "{\"user_email\": \"${email}\"}"
 
     final
 }
+
+e2e