Make the setup wizard compile again

- introduces more jobs
- needs more cleaning up