diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b8f05b57a4..ca06402818 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-17ae547bb1f8e2a80280be2b94a2134eb8df5fbf",
+  "image": "gcr.io/istio-testing/build-tools:master-5b65c620f39f8a750e68465dc49b6753926d0b0b",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index edba0435f4..134e4ec2df 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e710c4502c15f6a26c25cac812a20b1eb194a1c1
+5fa2fe83dbbdc1314d350364be66b89773d3cf31
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 4b2401ceaa..3f6f755993 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-17ae547bb1f8e2a80280be2b94a2134eb8df5fbf
+  IMAGE_VERSION=master-5b65c620f39f8a750e68465dc49b6753926d0b0b
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools