Port to the new CI