More tunning to the build matrix