diff --git a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py
index 7c7d77ae..cb71cff7 100644
--- a/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py
+++ b/samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py
@@ -40,8 +40,8 @@ CLUSTER_NAME=input("Provide name of AKS cluster and SQL big data cluster - Press
 
 #This password will be use for Controller user, Knox user and SQL Server Master SA accounts
 # 
-CONTROLLER_USERNAME=input("Provide username to be used for Controller user - Press ENTER for using  `admin`:").strip() or "admin"
-PASSWORD = getpass.getpass("Provide password to be used for Controller user, Knox user and SQL Server Master SA accounts - Press ENTER for using  `MySQLBigData2019`").strip() or "MySQLBigData2019"
+AZDATA_USERNAME=input("Provide username to be used for Controller and SQL Server master accounts - Press ENTER for using  `admin`:").strip() or "admin"
+AZDATA_PASSWORD = getpass.getpass("Provide password to be used for Controller user, Knox user (root) and SQL Server Master accounts - Press ENTER for using  `MySQLBigData2019`").strip() or "MySQLBigData2019"
 
 # Docker registry details
 # Use this only if you are using a private registry different than mcr. If so, make sure you are also setting the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
@@ -50,10 +50,8 @@ PASSWORD = getpass.getpass("Provide password to be used for Controller user, Kno
 # DOCKER_IMAGE_TAG="<your Docker image tag>"
 
 print ('Setting environment variables')
-os.environ['MSSQL_SA_PASSWORD'] = PASSWORD
-os.environ['CONTROLLER_USERNAME'] = CONTROLLER_USERNAME
-os.environ['CONTROLLER_PASSWORD'] = PASSWORD
-os.environ['KNOX_PASSWORD'] = PASSWORD
+os.environ['AZDATA_PASSWORD'] = AZDATA_PASSWORD
+os.environ['AZDATA_USERNAME'] = AZDATA_USERNAME
 # Use this only if you are using a private registry different than mcr. If so, you must set the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
 # os.environ['DOCKER_USERNAME']=DOCKER_USERNAME
 # os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD
@@ -68,7 +66,7 @@ command="az group create --name "+GROUP_NAME+" --location "+AZURE_REGION
 executeCmd (command)
 
 print("Creating AKS cluster: "+CLUSTER_NAME)
-command = "az aks create --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --generate-ssh-keys --node-vm-size "+VM_SIZE+" --node-count "+AKS_NODE_COUNT+" --kubernetes-version 1.13.10"
+command = "az aks create --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --generate-ssh-keys --node-vm-size "+VM_SIZE+" --node-count "+AKS_NODE_COUNT
 executeCmd (command)
 
 command = "az aks get-credentials --overwrite-existing --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --admin"
@@ -94,7 +92,7 @@ executeCmd (command)
 command="azdata bdc create -c custom --accept-eula yes"
 executeCmd (command)
 
-command="azdata login --cluster-name " + CLUSTER_NAME
+command="azdata login -n " + CLUSTER_NAME
 executeCmd (command)
 
 print("")