diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 591b24ffa8c..7448a9f7800 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-8584ca511549c1cd96d9cb8b900297de83f4cb64",
+  "image": "gcr.io/istio-testing/build-tools:master-87325f1549d326553c9e11b3f4a44e8eb6d17ca6",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index ab84035eb24..fd3ba39a9aa 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-82facb861038e3d797d9dc306ebcebbbb89fd14e
+27475018dd31a882220875fbe539146947b6b5f1
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index e2c5b92119a..18a51b570ca 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-8584ca511549c1cd96d9cb8b900297de83f4cb64
+  IMAGE_VERSION=master-87325f1549d326553c9e11b3f4a44e8eb6d17ca6
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools