diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bfe043ec..c6be872e 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-b9d5987e7b84504a75de25d4db720358198585fc",
+  "image": "gcr.io/istio-testing/build-tools:master-c67afcee625a4b91bdde7da65c9867f98248691e",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 650d7618..1554fcdd 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-56ae3fb30fa30f50c69905b3d2afe42532e412e4
+bea133e14a07520b9daeb01cc2f2b314e8228e7f
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index fa63444a..c7356e4a 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-b9d5987e7b84504a75de25d4db720358198585fc
+  IMAGE_VERSION=master-c67afcee625a4b91bdde7da65c9867f98248691e
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools