Switch to a single matrix builder
4 files changed