diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 82b7903b..a322addb 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-97049c90d949fc4bad6e0772187d25f7781d6c95",
+  "image": "gcr.io/istio-testing/build-tools:master-c74bd02738dce6695e6206d2b517a8b69e648754",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 1b235e94..37239c22 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-d8854ad13b4954a46aeba2749d3201b2b5b6e032
+50612729ef74c89d3704a537afac07b28c972879
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 281eeffe..d11f6d0a 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-97049c90d949fc4bad6e0772187d25f7781d6c95
+  IMAGE_VERSION=master-c74bd02738dce6695e6206d2b517a8b69e648754
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools