diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d888c9f2eb..86482a3cf1 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-a45db55f6be0f98a625f52e3b58564dd1568b75b",
+  "image": "gcr.io/istio-testing/build-tools:master-263c9e409744a0efcf5f052ea3b203e069707454",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 72514b188d..805db934b9 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f9c3ced054276bc926e2e9edb70958e3789da302
+3f8dd6bda6fdafdb00f96e6a3b52a371d73cc9c4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 951fc35fc8..658b038493 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-a45db55f6be0f98a625f52e3b58564dd1568b75b
+  IMAGE_VERSION=master-263c9e409744a0efcf5f052ea3b203e069707454
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools