diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index a143a0fc33..1b33a3cc93 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-83f70a3cec20d416707a9142492724980d6bb861
+42401de7cfdca5691539caedfb76a7d77fc3d3a6
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 188b861407..aa4262fb3d 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-fb08d14506ed189896898a140205ef1bfc7008cb
+  IMAGE_VERSION=master-fe925225ae6b796f54a13b0250b9474bf0dfb255
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools