diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index cab85934..0ff87caa 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-9637643344b97c5f67c2c1fc1bdd29a97d9930dc",
+  "image": "gcr.io/istio-testing/build-tools:master-121eded1f81117fdfa16a845d0be462cb0cd0377",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 1d55c326..d12c8eef 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-d9dad780c50ae7f54b79891605c462de66986805
+90cda40ea020489e55656a2c3bdca9fd93ec85c3
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index e5e37433..c5a2e822 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-9637643344b97c5f67c2c1fc1bdd29a97d9930dc
+  IMAGE_VERSION=master-121eded1f81117fdfa16a845d0be462cb0cd0377
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools