diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 9cf3aba05b..37ea14a4e6 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-6a1c744ef226989e2d5be532282f9098f77877fd",
+  "image": "gcr.io/istio-testing/build-tools:master-8d2a100a81731715ea16de11e8c9f23b2ddb3948",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index b21bc75838..578f1c3746 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-2dfbf3bcd0b3c217b5d8a285472cabf492f8eae3
+5cc5ed563d6dff7b2ef302b4bddb57d4b4d462ef
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 738304142d..40f3b9a829 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-6a1c744ef226989e2d5be532282f9098f77877fd
+  IMAGE_VERSION=master-8d2a100a81731715ea16de11e8c9f23b2ddb3948
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools