diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 39e3caa5f3..e0f5c2fa5d 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-0594e8d1767ca0597e5620edf83f08a3845fbdb4
+60bc00ec28474ed67d7bc1d1a94600a9d47bac3a
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index ba414fcb08..6448df9e60 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-7b5c2064d06c417cc34d4ed760fd65134055c301
+  IMAGE_VERSION=master-27f101af7f719c460198e8575284fa45d457bf2d
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools