diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 6bd13e5eca5..3420977ef1c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a5d4510eedcf54765e8a2e6a365944b2e05bc342
+9acbd2cf497f24a6ab8457a88c149834da614e6b
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 40e7e29c21d..10565c4f18b 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -73,7 +73,7 @@ fi
 
 # Build image to use
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
-  IMAGE_VERSION=master-cfe6fd8635ece336ce562daaf6fd8cb60d9c99ac
+  IMAGE_VERSION=master-ed24c9f15e5b6d2698260ca67704ecc0965cd798
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools