another try for improved build matrix