diff --git a/cli/setup.sh b/cli/setup.sh
index 8914f24309..5463c54ce3 100644
--- a/cli/setup.sh
+++ b/cli/setup.sh
@@ -20,9 +20,12 @@
#
-az extension add -n ml -y
+# az extension add -n ml -y
#
+# Use a daily build
+az extension add --source https://azuremlsdktestpypi.blob.core.windows.net/wheels/sdk-cli-v2-public/ml-2.31.1-py3-none-any.whl --yes
+
## For backward compatibility - running on old subscription
#
GROUP="azureml-examples"
diff --git a/sdk/python/setup.sh b/sdk/python/setup.sh
index 71b17727f5..008cbebce2 100644
--- a/sdk/python/setup.sh
+++ b/sdk/python/setup.sh
@@ -16,7 +16,7 @@ pip install pandas
#
# pip install azure-ai-ml==0.1.0.b8
-pip install azure-ai-ml
+pip install azure-ai-ml==1.21.1
# https://docsupport.blob.core.windows.net/ml-sample-submissions/1905732/azure_ai_ml-1.0.0-py3-none-any.whl
#