you should split it out of this PR about configuring the repository factory & co IMO