diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 54c21abfe0..34bd1895be 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-abc275e31699771b23c44bb81b8fef6e534517bf",
+  "image": "gcr.io/istio-testing/build-tools:master-df9603634533861a5749102076341ca11e2933d9",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index c304fd3be1..89020eea6c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-aac3c58f52639513df780e9aae765b324278c209
+c4e3f2f71bbc74d850fb70f1a01e9eebea58008d
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index f564ff5e62..ad4684d848 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-abc275e31699771b23c44bb81b8fef6e534517bf
+  IMAGE_VERSION=master-df9603634533861a5749102076341ca11e2933d9
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools