Finally get with the times and use Moto common builds