diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6c727a41171..d73a7554eb1 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-477dbe1d9543195f075d6e7ea487db29412db39a",
+  "image": "gcr.io/istio-testing/build-tools:master-d5b39ac8e423b269748c9c1e9692a853db960fc9",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 1b7fc5a8c4e..8f72d3787bc 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-9e67efb65dd75fd89e824fe534da8ddec4f501b5
+37b1df7c218df019feaa525e91c35265ba9a06f7
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index f34ec3e267a..6e2f1bd21c3 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-477dbe1d9543195f075d6e7ea487db29412db39a
+  IMAGE_VERSION=master-d5b39ac8e423b269748c9c1e9692a853db960fc9
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools