diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 9ed2f541d1b4..2682023cf485 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-3368bc1cbeb40b2c5cbe0c530d0c819cf284acb8
+bd107bb620fa23c8d7626d760e12425f07fb4a3b
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b450e072d1d6..550df22d8e3b 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=release-1.18-807663ab9e27f9d2bab5a7a78bcbecbd0e7ba17d
+  IMAGE_VERSION=release-1.18-b58d710da8f1c2bcee17f5d97e95dca8ffbcfc40
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools