Make the build self-contained
Update build setups