diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 149f4f3493..6b752e1230 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-bf956b5dae089f1585caf52f943df69447727b18
+4aaed195eb80d5edf6af5996836042bfd2a0e722
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index a8a8302483..291e867a60 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-5781e1080a49891e993bdadec6031d072943d531
+  IMAGE_VERSION=master-21f37360cfc984d6ff16821ee423f213d09017e9
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools