diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 23257770a02..33a36fe10bb 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-b2fd947843e65530ad23101cb27c00b0f2013377
+f4eb0b919f940a9e2071b77cc45c1193351ae4a4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 078b0c712e0..293085c1f27 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-9ac991a66bca797f602c066bcd14e0b8b967a55a
+  IMAGE_VERSION=master-8be6c093f3f0c0aca94477a03b4c6cf5f7194ff0
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools