diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 522fd446d25..4814bccfaed 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-30750b44971f0d66b92a8bcd681096a5f5e487f1",
+  "image": "gcr.io/istio-testing/build-tools:master-aaf98ee71b8156e12c6134366b872417d15dcd5a",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index b015502d0a7..6c6d7474576 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-8afa75103a20861ee4ed4cecc6b10d975b44e68a
+0d85ad5c87d38bd06ea5d08814df61e747e9135a
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 100ec2b7070..4f2208dc393 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-30750b44971f0d66b92a8bcd681096a5f5e487f1
+  IMAGE_VERSION=master-aaf98ee71b8156e12c6134366b872417d15dcd5a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools