diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4130286819..62c0949da9 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-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff",
+  "image": "gcr.io/istio-testing/build-tools:master-b0cb074639c0677b4d65e4548ae1ec70559e2ba1",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 09bdae112b..030fa276ef 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-be6513cc1433076ebdb636af99c9b171d9a36f27
+9c3d343cec2d3886528eeda26d650853f72884d9
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 49107e6429..673c62da8e 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-6ac9cdb3d1ad09092398ab15574ce88cf2ac31ff
+  IMAGE_VERSION=master-b0cb074639c0677b4d65e4548ae1ec70559e2ba1
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools