diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bb348965e7..520b4a26c8 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-8dcf63149d5bdaa83d1407a121098e8e8d1626dd",
+  "image": "gcr.io/istio-testing/build-tools:master-3858f8db549f6f7f73de4b55fba5075f71d2651d",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 74cad0294f..a876820769 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f335e7753c209c164f5c2d9d8f183fadc1e1cd98
+dec7a26170fc061fee7c159c1cf45220eacd9cf4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 02b5ce5717..b7e690662c 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -77,7 +77,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-8dcf63149d5bdaa83d1407a121098e8e8d1626dd
+  IMAGE_VERSION=master-3858f8db549f6f7f73de4b55fba5075f71d2651d
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools