diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 107cde7e62..05fe14a30c 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-0bd50c8633b3fa014a6fe17961d7f0b28a002385
+afc7d880a0b2d452fc9401f2bfc42ffcb0cc0b71
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 23afab3339..8384445ba7 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-8108c85d77550c2292ebc3c522b9eea1c0977eb1
+  IMAGE_VERSION=master-e1e81e06c98f0772da36f4623a4479a27f943451
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools