diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e50c8795e5..d1575ac939 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-2ea15c610ef8a285f0e2b9f85243c1fcbb9aeebf",
+  "image": "gcr.io/istio-testing/build-tools:master-5a7939a03b038be8bf32158c0c71ec8a343d3b6c",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 14f1a6a6ac..c5f016fe2b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-752e4feaddb3c45f1c4399cc186e0e396035b626
+6e376578070d2a958e8a0515c48ff4d8795e1eef
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 15ae4fbb03..ef3d1dbb9e 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -77,7 +77,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-2ea15c610ef8a285f0e2b9f85243c1fcbb9aeebf
+  IMAGE_VERSION=master-5a7939a03b038be8bf32158c0c71ec8a343d3b6c
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools