diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2651a07672..d11ed893cf 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-01f7536c929d3fafece5d92ce0f2d321205937f1",
+  "image": "gcr.io/istio-testing/build-tools:master-8aa031754a09946f714d6dc7df1e8bd400b4b2e9",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index e6b0cbfb0f..8316ed5c22 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-62ed7312d9bddaa7abfd0d7222577a9a8c505e05
+711151a7c7afd1deef80fa304b3e617e4ba8b7bc
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 54c8d9381a..a4a4cfa7e9 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-01f7536c929d3fafece5d92ce0f2d321205937f1
+  IMAGE_VERSION=master-8aa031754a09946f714d6dc7df1e8bd400b4b2e9
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools