[In Progress] Support domains on upstream

Good point, thanks! :+1: