diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 97527904aa..719265f2da 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-9d68fc5a210b4d2fc232be70470092c38df6fda8
+c652fc10a113014c3755778e971603fcbfefb0fa
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 011d66b9c7..aeb6888449 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-69c71410d473940c203cf70be00681bd2b0c74ed
+  IMAGE_VERSION=master-04cfef4d3b89cbc1a32f2983460724ac4f450154
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools