Address review comments - remove remote user, add git ssh, move some vars in templates