Align to production endpoint