diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d29788f5579..4695c6f3fcf 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-fbec74f127fd72c16999f8d8872b45bcf718eb1c",
+  "image": "gcr.io/istio-testing/build-tools:master-3a1982fd09c72f345f85d394d5cce906b5484b76",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 8bdb6c55892..0637f4843cf 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f90e4005701a38b153246bc0d9e7314977b250bb
+cbe0f69e442f6d1d19c702d931b39048abd833c2
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 0e8c7a41af7..0712ff2c377 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-fbec74f127fd72c16999f8d8872b45bcf718eb1c
+  IMAGE_VERSION=master-3a1982fd09c72f345f85d394d5cce906b5484b76
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools