diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 09c68a8451..71af55c414 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-98686c03c86b33b4b0ff6a2015bacb30e9c3db97
+f9d64a5f4fd9cf1d640c1dd50f673c148eb960a9
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 4d79f48fda..080aeb193b 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-22361bb38783e99292f4c2b6695f46669f6ed6e8
+  IMAGE_VERSION=master-bbf310864a8dd61c66af8ead0786b1ec2d7cfc72
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools