diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b6dcc58d30..bb348965e7 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-3a6394ccbd573a8fbfa5cb6e01ec7a674dc076e2",
+  "image": "gcr.io/istio-testing/build-tools:master-8dcf63149d5bdaa83d1407a121098e8e8d1626dd",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 42f0e6c9be..74cad0294f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f5c80d93d0a0d41d4dd5955fca71497fbf3c8e63
+f335e7753c209c164f5c2d9d8f183fadc1e1cd98
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 3065656612..02b5ce5717 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-3a6394ccbd573a8fbfa5cb6e01ec7a674dc076e2
+  IMAGE_VERSION=master-8dcf63149d5bdaa83d1407a121098e8e8d1626dd
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools