Add #TODO to remove deprecated HOSTNAME entry and correct it as well