diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 045709fc6a..5d351c938d 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-19ae86d66a54c72ca3041ff75677b630083b8463",
+  "image": "gcr.io/istio-testing/build-tools:master-2892b009f34a3a86638834d7a1070d549daaccd1",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index ae1a70dd73..6928ccc605 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-6124a75104420ebb060219371aee01e9b7b905be
+a0434b881d7810fada661975a26b5d0ee61d688d
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index c826b916ab..3c8a4e40c1 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-19ae86d66a54c72ca3041ff75677b630083b8463
+  IMAGE_VERSION=master-2892b009f34a3a86638834d7a1070d549daaccd1
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools