diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9d1e2937118..49e7208dbd6 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-4aaf7755914c4780424e146e4af14b57e282aad0",
+  "image": "gcr.io/istio-testing/build-tools:master-45d20b51ed96475ae1916b83a260c66585191808",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 5b98b14ae8b..34bb191f29b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-7142102053281346b7cbcd5cf847bf792f824d00
+de634a2ae138a99e90a1022d743d829bc0ce3a7d
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index cbb6f416393..0d0238ac789 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-4aaf7755914c4780424e146e4af14b57e282aad0
+  IMAGE_VERSION=master-45d20b51ed96475ae1916b83a260c66585191808
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools