diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 552ead2b..e6ccff8c 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-9460c357bef20580043ff07bef9a3a489431b380",
+  "image": "gcr.io/istio-testing/build-tools:master-f24be7b713480aab44d862ac839ead0b5324d593",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 3ce05a41..cea32550 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-71e0b2154c35851147dd86d1dd71a0fbdcb54662
+9088296b1343d1a3b2e3f822f6d7942ff2de7a15
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 5eb421cc..50866ae1 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-9460c357bef20580043ff07bef9a3a489431b380
+  IMAGE_VERSION=master-f24be7b713480aab44d862ac839ead0b5324d593
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools