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