diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d1b617703f..a62dcfb51a 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-729445273a43b5d6b2813b14c787fb5903965d04",
+  "image": "gcr.io/istio-testing/build-tools:master-3535f531f113c809b681e16eef20222bda221ab1",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 64760126c0..f3bf6fa668 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-bcf78820ae73e00c1e21ad9212b046905a7bfe8b
+8c929aaefacb115e6c0671eeb6daab1e1367d56c
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 7279b3cb06..6e6ec897c1 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-729445273a43b5d6b2813b14c787fb5903965d04
+  IMAGE_VERSION=master-3535f531f113c809b681e16eef20222bda221ab1
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools