Using hostname as name and adding self only as needed