diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 9be80f586c..1c525f2172 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-a8a0f77fa9625b377c88a5b80f23eaaa3d7df689
+0618e815c4f1e2b77221e197a5d0d4d46c207a0f
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 279246977c..5f01c2b093 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-f166b4a2166fb6e8de949a15eb2775e89ffc3e53
+  IMAGE_VERSION=master-7cb17d17e2e98087622580837b2cd61400011c84
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools