diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 5ce53cde9ae..95c155caf4f 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-0baa425700a8c22c5c8d9c45de6b3426da8100ff
+50db20dcc7eaac1c3972d5f77a5effea24b45522
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index eedd8b49b21..264276deda4 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-65b95c3425a26e633081b2d0834cc0df6e81fd8a
+  IMAGE_VERSION=master-88a80bcad902424e66a2f87185dff35a2e6a2af8
 fi
 if [[ "${IMAGE_NAME:-}" == "" ]]; then
   IMAGE_NAME=build-tools