diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bda435cc3be..6470c1216fd 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-ded7e39747b2cf9eb9fa8c2dbcf25d9c84a4b407",
+  "image": "gcr.io/istio-testing/build-tools:master-29113a4954abc8d22b157167e416e2a8509b6549",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 18e0161a6b4..73752d72d3c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-689b33f2ec2fe303ad3f11ec18b65311070acaa6
+b956efc196b2f30cb5c200f3ff960199900ca2f3
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b1c6c824079..1f8e15a10ec 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-ded7e39747b2cf9eb9fa8c2dbcf25d9c84a4b407
+  IMAGE_VERSION=master-29113a4954abc8d22b157167e416e2a8509b6549
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools