diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5d351c93..ba160f28 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-2892b009f34a3a86638834d7a1070d549daaccd1",
+  "image": "gcr.io/istio-testing/build-tools:master-35d1af3085fd0016dd4e61fd4d878107281ebee0",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 0bee0bc9..bebe6f9c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-15e31cf7d53ff4c65a6e8926a1fd74b9125cb8f3
+5f9990de10cd7e7dd98ef8f1c6f8eda5f6478fd6
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 3c8a4e40..b57544d2 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-2892b009f34a3a86638834d7a1070d549daaccd1
+  IMAGE_VERSION=master-35d1af3085fd0016dd4e61fd4d878107281ebee0
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools