diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f4722c61..2c76a316 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-5aaefda47e784752b1850e28d8f8ae4f176850c8",
+  "image": "gcr.io/istio-testing/build-tools:master-e1fcc89d18dcbddd83c4934416e5b8b6faa09691",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6619cc5e..472d692e 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-bedafce1e6b24b587acd6d7ccd13ec1a87537b21
+cf3ae8349d9720b56c625439c3f6a4c7c5b60f82
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 33603f45..5b87f16a 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-5aaefda47e784752b1850e28d8f8ae4f176850c8
+  IMAGE_VERSION=master-e1fcc89d18dcbddd83c4934416e5b8b6faa09691
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools