Make service name more predictable
Make hostname less mandatory