Use new role names and update domain to match environment