Move to new build-tools