diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 508c2685..0d0fb7d3 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-8fb9ce88f6ad4cdd35c1660cd0ad0ab67eff4c6c",
+  "image": "gcr.io/istio-testing/build-tools:master-0a3e32bcf545d54c5dcc3833b1ecfd911b5533a2",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index e8b9cef8..a9c5cca6 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-e815dd568ad11e92eb49f05df6e5218dc89e159f
+34d5536164dfc75b4a087666aaf733947c87e076
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index f0b87134..f689399d 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-8fb9ce88f6ad4cdd35c1660cd0ad0ab67eff4c6c
+  IMAGE_VERSION=master-0a3e32bcf545d54c5dcc3833b1ecfd911b5533a2
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools