diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 04bc54e6c3..ce531b7944 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-6e3c5ef9f21b63364ce5eabe115ee000a9f012b7",
+  "image": "gcr.io/istio-testing/build-tools:master-18659ab5deb644ab728206113deffe161b181dbf",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 21427b3605..4504d3a1f2 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-216cb63e2dfce4f80e3e4dc5d6bdf8a59a57493f
+ba7210ce85bf5b4ea2795fdf3cf66cc971360224
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b739be6118..1bc9bde45c 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-6e3c5ef9f21b63364ce5eabe115ee000a9f012b7
+  IMAGE_VERSION=master-18659ab5deb644ab728206113deffe161b181dbf
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools