diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7f9c5e0512..7b649ac32a 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-4c71169512fe79b59b89664ef1b273da813d1c93",
+  "image": "gcr.io/istio-testing/build-tools:master-a6aacea56463a118b848ae002e42d72075e00f02",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 249893fa66..66fbda4808 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a728190cddfb7aa1763f0aad8c02fae12103f6f8
+4f689095acd3eb53cd2a5ca8352d673d7304a8bb
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 6bc20d8f43..1f315977d9 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-4c71169512fe79b59b89664ef1b273da813d1c93
+  IMAGE_VERSION=master-a6aacea56463a118b848ae002e42d72075e00f02
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools