diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 8c2cb583e7b..a143a0fc33e 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-447cce208e7c5c634ad1143bcbed6a1bbdcf77ab
+83f70a3cec20d416707a9142492724980d6bb861
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 79c2638639e..188b861407a 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-5dae0f9ba19425390de0ea46c9e6d3eae91e0a36
+  IMAGE_VERSION=master-fb08d14506ed189896898a140205ef1bfc7008cb
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools