diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 28d5ed479b..8c2cb583e7 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-8f1594bbcf9f268617ac9856c194dff83377c426
+447cce208e7c5c634ad1143bcbed6a1bbdcf77ab
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 656111f67b..79c2638639 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-d9cc8912ef383fa3127e6529c07146ab51b0c625
+  IMAGE_VERSION=master-5dae0f9ba19425390de0ea46c9e6d3eae91e0a36
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools