diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 04a1e855c3..75cfc16e91 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-35ba765f8703e7dc5d1ed760a72d88b3c1f3849a",
+  "image": "gcr.io/istio-testing/build-tools:master-32187b891c5e9353c42b45ab386fb5afeb2f1c6b",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index e8a0e6d4c3..5908107c6b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-77c04d6b6fd568da3342014b7b1fc3610f9c75cb
+cb566c951a14407154961684d768d40a39afec09
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 812eab2f59..22a0bc0e8c 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-35ba765f8703e7dc5d1ed760a72d88b3c1f3849a
+  IMAGE_VERSION=master-32187b891c5e9353c42b45ab386fb5afeb2f1c6b
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools