diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 171a4dbb..ac921787 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-b243f443862c075054d6061ce7d753d47b6c0a11",
+  "image": "gcr.io/istio-testing/build-tools:master-936207ec8823f21aa330a82c20649c6f9e2f7a22",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index cf829e99..1abbadd3 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-aea3a48610b7476dccd70e84b3f84668e7fa7dca
+3e7e4a6330e5a70608669a7bce30c737d961b36e
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index e7d693a3..6eadbf57 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-b243f443862c075054d6061ce7d753d47b6c0a11
+  IMAGE_VERSION=master-936207ec8823f21aa330a82c20649c6f9e2f7a22
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools