diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 992f78d775..b283210a71 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-0b03d2e90b025edbf5b6676542c7fa76d86f7b2f
+7d0c516aa1d8d1b353ab3c3c350e86f04f936b0b
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 80a944bb79..bda7311728 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-02d0170e96d4ab64de8f736e5e9d8d80dfeffb06
+  IMAGE_VERSION=master-ba6dd96b773cefe3c8361b2c141f05abbb140e5d
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools