diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 174aa9ac87..2222a562ae 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-1ee4cbbec23a26932c8795961dcf4e604ef6dc50",
+  "image": "gcr.io/istio-testing/build-tools:master-061780fd3181da88f895dcfe350a34daa4aa1076",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 99e5193058..100d99a4cc 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-988d7adc3ffb7039f654021b5693aa05bb90b1cf
+559e9789af605e7d5614d85bc18d88301e264efb
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 14fd383af2..7f6cd0faa8 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-1ee4cbbec23a26932c8795961dcf4e604ef6dc50
+  IMAGE_VERSION=master-061780fd3181da88f895dcfe350a34daa4aa1076
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools