diff --git a/files/.devcontainer/devcontainer.json b/files/.devcontainer/devcontainer.json
index 70205e6d..14d5328f 100644
--- a/files/.devcontainer/devcontainer.json
+++ b/files/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:master-dfedc8d689da03c57793a8e62e75a6bc36d2ae07",
+  "image": "gcr.io/istio-testing/build-tools:master-415d8353c095cdc3cb100d23fe4cb8e60611d3b4",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/files/common/scripts/setup_env.sh b/files/common/scripts/setup_env.sh
index afab1ada..2e891f6a 100755
--- a/files/common/scripts/setup_env.sh
+++ b/files/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-dfedc8d689da03c57793a8e62e75a6bc36d2ae07
+  IMAGE_VERSION=master-415d8353c095cdc3cb100d23fe4cb8e60611d3b4
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools