diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a59dc79f3ca..76de11369dc 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-1a11fda6c5ff6651c9ab6a99df8a425b891211b9",
+  "image": "gcr.io/istio-testing/build-tools:master-837fadfda83160b87fcf4785b38ad386a48c66ab",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index f91f2f8f1f7..db7fe254ef2 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-b7ae4ccfe83bff3a11fad85b71f4e42b75f1fc1d
+6403a5054d10955bf227504b88aecf8b2816928e
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index a3387445fa0..46f1c992cb3 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-1a11fda6c5ff6651c9ab6a99df8a425b891211b9
+  IMAGE_VERSION=master-837fadfda83160b87fcf4785b38ad386a48c66ab
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools