diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8a6a4a7e..508c2685 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-186b999d72782125ee1fe7da44df3efc4e7b00a3",
+  "image": "gcr.io/istio-testing/build-tools:master-8fb9ce88f6ad4cdd35c1660cd0ad0ab67eff4c6c",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index f0058126..e8b9cef8 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-86668426efce75eb9b2301e8ad1a98f3e1a68546
+e815dd568ad11e92eb49f05df6e5218dc89e159f
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 41b294d7..f0b87134 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-186b999d72782125ee1fe7da44df3efc4e7b00a3
+  IMAGE_VERSION=master-8fb9ce88f6ad4cdd35c1660cd0ad0ab67eff4c6c
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools