diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 06505a3586..110839131a 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-ea3f3780a0b6c4325196cfdda2c1c0e784fe685c",
+  "image": "gcr.io/istio-testing/build-tools:master-4d8a6668b6d46b3becc35f9b24467f841bbb020a",
   "privileged": true,
   "remoteEnv": {
     "USE_GKE_GCLOUD_AUTH_PLUGIN": "True",
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index cf551f800b..3dd87a7b90 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-74a6d743a37244fd246a9ac776ce01cfa724d0ab
+6174b58ad0379ae1ecfa75187f63e8cf62d9ab61
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 6f4c44cce0..e469da0d0f 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -77,7 +77,7 @@ fi
 TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
 PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-ea3f3780a0b6c4325196cfdda2c1c0e784fe685c
+  IMAGE_VERSION=master-4d8a6668b6d46b3becc35f9b24467f841bbb020a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools