diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ba112cd86c..609e3a770e 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-8c6fd99f50a8acae83a260340848097c002d2e0b",
+  "image": "gcr.io/istio-testing/build-tools:master-62f8b507af660ecccb613e643daf5ea546222ac7",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 5c5fca9b88..17a8f0f9cd 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-fcdeddae52d90817263f273954d0eb23456b4b7b
+712d90bfea632fc23e4eebd9b9d73e45c6bfdbc4