diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ca6fdbbce3..275d2e0cea 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-be550dc8a27cfd7abdc3a8b9b32044702524c8e1",
+  "image": "gcr.io/istio-testing/build-tools:master-a27b9b60db555184f332436a42268021826344f2",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 5cd45e3626..90936eab05 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-472ae75d7c1e106eaa762f50d32fbc943e1c6eac
+8c1cbcf584fd844714bb4e0f07de6455e3680cbe
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index c4fb7b9ff7..90ec3896e0 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-be550dc8a27cfd7abdc3a8b9b32044702524c8e1
+  IMAGE_VERSION=master-a27b9b60db555184f332436a42268021826344f2
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools