Remove the number of builds by including only some combinations

This should reduce the time needed to complete the build.