diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index dd653dd891..8bed9cf0f0 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-eebcdda8856e2d4f528991d27d4808880cce4c52",
+  "image": "gcr.io/istio-testing/build-tools:master-011fa76a5d2c95261e3b6d31b44e3dc1e74d43bf",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 2116519f3c..2509c04163 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-4b0a2a0dfb7b3473a6a7457bb05029afcb8d4e50
+50d58c14d4984b40a1186e0e5f1c24729211d4e4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index fd289b1daf..860962496a 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -77,7 +77,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-eebcdda8856e2d4f528991d27d4808880cce4c52
+  IMAGE_VERSION=master-011fa76a5d2c95261e3b6d31b44e3dc1e74d43bf
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools