diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 64913156bc1..8f38af08742 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-ff93080f0b66b1649fd6f3bfa6b63f74be377937",
+  "image": "gcr.io/istio-testing/build-tools:release-1.20-34280d4080c4ab8f8cbb5aa3913a2beaaebb4242",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 7620e144ad9..3088173e0d2 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-7cb13ce94ad9bff2d19d4bd3b8b95843e595f3d8
+93ccbb4edd0ed1f1d6163e9c091aaba724e9616e
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index a5d32cdbbb4..138441e3f0d 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-c29f172e9f11e5cd9e5d2e9ef1882f4abafaecb5
+  IMAGE_VERSION=release-1.20-34280d4080c4ab8f8cbb5aa3913a2beaaebb4242
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools