diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 7af02ea73c..28d5ed479b 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-ca04156aacaf230f7adb21af7ace93d7843c8d3f
+8f1594bbcf9f268617ac9856c194dff83377c426
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 539b833c81..656111f67b 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-37718fa3c18cd3a726c344664956aa9be1837c09
+  IMAGE_VERSION=master-d9cc8912ef383fa3127e6529c07146ab51b0c625
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools