Proper build matrix