Move CI def to first occurence