Update with tooling to build with custom repos