diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index b3ba53183aa..cac51652dde 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-491344bc0de670df2b0d00520498256e687b4bf4
+b2608131f6d7bb5166fb6d1cfeb4b5f0cffb61bb
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 0cac131c96b..673868bf3db 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-e519cfe7cb31dd45c12b9420d81784dc54a87a53
+  IMAGE_VERSION=master-c8a7e42685e75ec46f4b389b06edf982bf231983
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools