diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b2c2f7f50e..e1fdf75e6a 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-16c0eab645a48824ce8804158c3b739cd8aa89e1",
+  "image": "gcr.io/istio-testing/build-tools:master-0ca0710606e48fec7a7fd53317baa800f80eb623",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 3fc3aa805f..63f75231e0 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-87f63f15dd9d25fc86016eaf7dd434ca462e3e5a
+0671f04cc8b6fff21fe2bf0aa8e3c5133d7957dc
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index a394669a5c..9c57fc0c2d 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-16c0eab645a48824ce8804158c3b739cd8aa89e1
+  IMAGE_VERSION=master-0ca0710606e48fec7a7fd53317baa800f80eb623
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools