create proper remotes

Change-Id: Ic67fedf4b250b7084386a3a3d87c5afba9064cd5