diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8d60086170..c2d3d66456 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:release-1.20-7a5a6eaafb86469d7796ab193153d04e437c85ad",
+  "image": "gcr.io/istio-testing/build-tools:release-1.20-4cc888b2d1a14f4502efbc4b1eb5d6b082dfaa62",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6c54c5e70c..c1d6d72071 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-183b76ad9ce124dfb7eb6d636f15c45dfdf70acf
+2c849a135eabe73cb9624a5a069cc5601943155e
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 6fb55e3d8b..e32759d376 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=release-1.20-7a5a6eaafb86469d7796ab193153d04e437c85ad
+  IMAGE_VERSION=release-1.20-4cc888b2d1a14f4502efbc4b1eb5d6b082dfaa62
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools