Use the new CI location, and make it configurable.