diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index bcaf5b79..da136847 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-1f7ce310688a91fa34b704db34a2ccda43b50073
+83492350a5bfce46bb0611d5187c84ff590527cd
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 8ecc5e3f..e7dfed92 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -75,7 +75,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-19f0fb6c28d080531991023434dfadb2687444e2
+  IMAGE_VERSION=release-1.21-cb41efc8037f47a65938fea1628981aed4887add
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools