Re-order manifest build order