diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e2ccc13154..ed0a328455 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "istio build-tools",
-  "image": "gcr.io/istio-testing/build-tools:release-1.21-4ef8661a6a388d403616444787141bb47a04ee39",
+  "image": "gcr.io/istio-testing/build-tools:release-1.21-c3faed1158524149e46b2af5567621ab6e43a8be",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index c906fb59ce..c67c7a0cbd 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-994ec08882325c03642242b65a43f77eb6615a4f
+06e135f7547513ec25ff68499fdf5f9dd03de583
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 8fc2b88dc4..d0c1ef4623 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=release-1.21-4ef8661a6a388d403616444787141bb47a04ee39
+  IMAGE_VERSION=release-1.21-c3faed1158524149e46b2af5567621ab6e43a8be
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools