diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 76de11369dc..8b2da19fcee 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-837fadfda83160b87fcf4785b38ad386a48c66ab",
+  "image": "gcr.io/istio-testing/build-tools:master-5ff07e737aa789d3df91dbd3717963ad6db8b7f9",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 516efdbf71d..2dbe9fe14c4 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-7d5d2f93cd46e0ca14a7586f5fa7c667335714e5
+84cbddeb24a9310692f87db4435971d2d67f3e00
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 46f1c992cb3..8b1b243cd6b 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-837fadfda83160b87fcf4785b38ad386a48c66ab
+  IMAGE_VERSION=master-5ff07e737aa789d3df91dbd3717963ad6db8b7f9
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools