Move to using an aggregator build