Reworking CI scripts