Update build scripts to match default BP setup

Hopefully these will be closer to what Jakob used