diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 3235d8e43d0..de76dc94c6b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-380f9486e3d3bbf840ee9af2638fcbec98bea003
+b2b2ba9ab1d472e85395b5031a8f6efacc00d3e3
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b2f50ca90ac..27313de5617 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-24aeccb0dc41b81e9c7c087a20d8285ad9f7a3f9
+  IMAGE_VERSION=master-1bc74cc11e2ba85f8f718652ca2ddd310c912225
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools