[watcher][minor] cleans up setting hostname, for linking