diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0a8d8344..bc97706d 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-73c5b68fd5a13093fc1a4d21edf92b6241d4054c",
+  "image": "gcr.io/istio-testing/build-tools:master-bc6f7ee13496c765fc37b746dfd66c48428e5e0d",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 7d63f4ad..bc2058d2 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-79fdfc73f80957004f387ae8dae2cef2b6b6ab59
+c42aaaa46ec1a01d74a295c5203e39648e260bce
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 957bdcd3..c1aca511 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-73c5b68fd5a13093fc1a4d21edf92b6241d4054c
+  IMAGE_VERSION=master-bc6f7ee13496c765fc37b746dfd66c48428e5e0d
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools