diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 9402d726f36..4821071bc86 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-1390d51f762f8626a582b524fcaec400484f0f90
+8f0a8a3d3dd0de33b19c37b4558e7609e9756223
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index fa4a75368cc..a23eefb3f72 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-dff6a9b47ff38dbf8ed14a58614468d37e11c626
+  IMAGE_VERSION=master-543df8650504fdcb1f3057c3e37683552739efc4
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools