diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index faf604bbb7..f78ed94012 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-97af7d3c6f6057a41dab45e8780a6d3d56820f15",
+  "image": "gcr.io/istio-testing/build-tools:master-f2e92ddbc4c523e36db35a97458cb76a0581f51f",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 8f55fb97d1..54000e3c06 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-55e3207e3bb188cc2c91cf68d20ca29258673132
+8d2ed42c33918e9ef378a4bc689e70fe0dd9e9ad
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 635e7f2214..b67e8179c2 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-97af7d3c6f6057a41dab45e8780a6d3d56820f15
+  IMAGE_VERSION=master-f2e92ddbc4c523e36db35a97458cb76a0581f51f
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools