diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 99dbc3da..2985e146 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-b91a7d440986fd960ff8562554fc95413d163d90",
+  "image": "gcr.io/istio-testing/build-tools:master-9ada773d9fa9bb7aeef8ef316f8624d27ea3e2b6",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 565289b1..afe0d72e 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-67b8114d6f8d187d2f4650991a1cb5e9bf167b10
+c6d1aaa9f294ab30157f809debf4644d0d7494a9
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index e77c678a..9ae2e10c 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-b91a7d440986fd960ff8562554fc95413d163d90
+  IMAGE_VERSION=master-9ada773d9fa9bb7aeef8ef316f8624d27ea3e2b6
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools