diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9eefbcab5a..a18d38e424 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-12939d7be6baee95d63b1a9d7c4e194f1b241257",
+  "image": "gcr.io/istio-testing/build-tools:master-3d91e3d29bd1057b14995647d90cbf85e043eba6",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index feef7bcc2f..38882e38fe 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e955cacd8ba890189a80551485d35a0e228276ec
+a51c98a54f1d406a21dd2ff0c7bf49ff995dde23
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 746d900ed1..c19a40912b 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-12939d7be6baee95d63b1a9d7c4e194f1b241257
+  IMAGE_VERSION=master-3d91e3d29bd1057b14995647d90cbf85e043eba6
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools