diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 02e6abfc5d..688ffa1fb4 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-a190abd165fe1155e0d31c207223b9ee2ded0b24",
+  "image": "gcr.io/istio-testing/build-tools:master-5f41028f26adf855f0dd0bfd8781621f0a57d471",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 2a7329775a..c04da60ef2 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-58bbdce175e58b89c3b090d8dc596d29a299dd8f
+d5363ff28cadae7d9404712bc4bc31036bf0ab2f
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 50cde6a5f9..bc63c06c23 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-a190abd165fe1155e0d31c207223b9ee2ded0b24
+  IMAGE_VERSION=master-5f41028f26adf855f0dd0bfd8781621f0a57d471
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools