Use new AWS endpoint logic