Refactor CI config