diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c7d55891b3..15251b6577 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-621a64a11b30f703b2e887df91862fffdd16112e",
+  "image": "gcr.io/istio-testing/build-tools:master-4759bf88d40172234fc6a0b9e11a4c5f1ea58a90",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 077219cb74..aebb24f3e7 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-d09ba3d6a3a89b606bae1bbe4a1e6537b1b72d79
+82dc68a737b72d394c344d4fd71ff9e9ebf01852
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 9dcc144a70..c63f1fa33e 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-621a64a11b30f703b2e887df91862fffdd16112e
+  IMAGE_VERSION=master-4759bf88d40172234fc6a0b9e11a4c5f1ea58a90
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools