Use correct endpoint URLs