diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d4b21fd28a..3611c7545b 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-b6f648885dce1f3e20b1ac61bd491e0230f4a8ab",
+  "image": "gcr.io/istio-testing/build-tools:master-f765f42b0bbcfbfffc112630404904784118a25b",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index f4a3a22a01..7e4687cad7 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-5f230b35b131c90a0301a8fc0ea2732362c25490
+f48640e24b3bbca425d82d33f582bffb048b6b2e
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 39e82298eb..1424da0634 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-b6f648885dce1f3e20b1ac61bd491e0230f4a8ab
+  IMAGE_VERSION=master-f765f42b0bbcfbfffc112630404904784118a25b
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools