Attempt to simplify by using build matrix