Switch base-caf-jb to v2.0, add extra remotes