diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1b7555aba1d..3b50a37a27e 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-99540faae1b7599a14622e23516c3871bfa23f39",
+  "image": "gcr.io/istio-testing/build-tools:master-ba83efa035ca4957a5a737d7286bf21268f91c48",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index bff4a652dfa..dd4a1fb6f1f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-32d583a8a74573d66f1451578a5f7d67584cb356
+c86a2b06cea5bcdd9d88bb7ce72528b1c6c72b75
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 436d418af77..7fbdce755b7 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-99540faae1b7599a14622e23516c3871bfa23f39
+  IMAGE_VERSION=master-ba83efa035ca4957a5a737d7286bf21268f91c48
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools