diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 74596e5d42..33df09d42f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-69ecf210b39478ed277caa58c0852092c4161384
+345ec4aa5a5466d74342a51dd8c82da48a1fd590
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 883a0ffa2b..8de7dbc4b6 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-96522631475bda0114bcab54c375877727c58132
+  IMAGE_VERSION=master-6feecaa7b2e32bece24b06e719407e524a85fa61
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools