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