diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e1fdf75e6aa..5a71a1e20f9 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-0ca0710606e48fec7a7fd53317baa800f80eb623",
+  "image": "gcr.io/istio-testing/build-tools:master-1fec76d441c9ed8960d9d5c37ca09353f8ce6c7a",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 63f75231e00..f8ecababe8f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-0671f04cc8b6fff21fe2bf0aa8e3c5133d7957dc
+67f3567c61ebe31e0f78dbf7b986ac58e344e1fe
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 9c57fc0c2d7..bd5f88d44dd 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-0ca0710606e48fec7a7fd53317baa800f80eb623
+  IMAGE_VERSION=master-1fec76d441c9ed8960d9d5c37ca09353f8ce6c7a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools