CORE-6040 updated endpoint index