Use new endpoint logic on ssh client and server side