Separate out distro and upstream repositories