Simplify Build Matrix to speed up the build