Switch to common build infrastructure