diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index fd88ff0bd5..03af5bdada 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-3bb9227619a8e384d453d92f6e4a167947a6931c
+755837c901a3e1fc7314c59b4fee70343fd6ba86
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index bda7311728..1589be98b0 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-ba6dd96b773cefe3c8361b2c141f05abbb140e5d
+  IMAGE_VERSION=master-6457dabf9a85edc7389051a10b1ab6595f24206a
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools