diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ad93158d..6feea465 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-ad9c72da1becdfd5b422ac2db099e449b4e0655f",
+  "image": "gcr.io/istio-testing/build-tools:master-98611daf69a610cfdd40df05d9496013a46dfefe",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index d6140632..40f78f4b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-2cfe47bd06fdc2e09a4e6ac25c02f862de47c671
+f3ed58a96a17fd76298cfe6d02eb5c1881f97eea
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 230d8c0f..600baa79 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-ad9c72da1becdfd5b422ac2db099e449b4e0655f
+  IMAGE_VERSION=master-98611daf69a610cfdd40df05d9496013a46dfefe
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools