diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d22bbeb44..9aecd46de 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-57f6bfb4cd73ad525b3e9d51a73e9bacc6b861fe",
+  "image": "gcr.io/istio-testing/build-tools:master-4c9f95bee45b69e9994aa977ab07728cf9d10d67",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 5c1370098..e9a8087d5 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-1d3fed9a8bef028dda07f3da3813d34397956319
+a248aeb40617873a8f798c1afcda3838e5629733
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index fbcc6055c..ece34b20d 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-57f6bfb4cd73ad525b3e9d51a73e9bacc6b861fe
+  IMAGE_VERSION=master-4c9f95bee45b69e9994aa977ab07728cf9d10d67
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools