diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 2d8b42a11f..00e27facb6 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-ede01790d931dbb424640eb35b08229c445dd921
+ff114dcaed6d3f72079aac90c52461106f4bc8f2
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index aa4262fb3d..8c52aaa2d0 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-fe925225ae6b796f54a13b0250b9474bf0dfb255
+  IMAGE_VERSION=master-d8a48a31329112b98466a211073ecae77ed943c0
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools