Add ability to use custom hostname with cli