[AB] [57256458] Change package endpoint and spruce up