diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index c4c188839a..aee66d9893 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-3d7e9ef644b931cc61c630bdf0322704c1b4f44a
+ac4cf14054d8c06b553e5f282e453bdff21dcd5d
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 6166c0fa63..302109b53a 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-d9e298f7cf9bb76b7f5dd9f18367725b05ad626b
+  IMAGE_VERSION=master-5476a2a447736be89da74102c1c67ebbd6918b5a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools