diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6682ff19..916acb7b 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-7da9e46975d7054e063f55c12d9a3a1cfba7cad2",
+  "image": "gcr.io/istio-testing/build-tools:master-b289d88108608ea89c92df7f07704b4e4f4b0152",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index dbce210f..548fedb9 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a3d061101325ae04f04cbd5aa732fd99fe93fcce
+a6fec0f38e572a30db5bf6a78d6fd905b413efe7
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 8a50b442..a34e8668 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-7da9e46975d7054e063f55c12d9a3a1cfba7cad2
+  IMAGE_VERSION=master-b289d88108608ea89c92df7f07704b4e4f4b0152
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools