diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c44e85008f..322715dec7 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-3f0f221437f9109c83e5dc5120fd9f185bbb3307",
+  "image": "gcr.io/istio-testing/build-tools:master-a80b0e43255eca1b0094d203f57fed148e1f5cae",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 38b5c407e6..a21391f708 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-fbf428737bbf45dbdf0041c2968d28e2f4afca5d
+5a915b1617d9d91bce8e3a6c64ab0f9ae4e97ca1
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index f63ff4d2dc..72ba548e42 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-3f0f221437f9109c83e5dc5120fd9f185bbb3307
+  IMAGE_VERSION=master-a80b0e43255eca1b0094d203f57fed148e1f5cae
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools