diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 71af55c414d..6b6363ac650 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-f9d64a5f4fd9cf1d640c1dd50f673c148eb960a9
+cbb37d1d13a5de0456f7c1a4d6aad0ce52d405e1
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 080aeb193b6..6166c0fa634 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-bbf310864a8dd61c66af8ead0786b1ec2d7cfc72
+  IMAGE_VERSION=master-d9e298f7cf9bb76b7f5dd9f18367725b05ad626b
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools