Finalise move to sprockets based build pipe-line