replace endpoints on start

Change-Id: If83b589717a8327ba2191ba0584d36bf9e88dc75