diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ef4c247c37..c6fa33b03c 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-ba6e7d3a0ff9666b1cc2a650507b0d99acfefff4",
+  "image": "gcr.io/istio-testing/build-tools:master-6bfe0028e941afdae35a3c5d4374bc08e3c04153",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index dc2e8a2aa8..02bdacd272 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-272e6cbb1bfbeceeec17ba3ab6a103305db2725b
+0534ded1b742f889f515f2c651122889c382aac4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index cd0c277e7b..730a21942b 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-ba6e7d3a0ff9666b1cc2a650507b0d99acfefff4
+  IMAGE_VERSION=master-6bfe0028e941afdae35a3c5d4374bc08e3c04153
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools