#4775 Refactor CI config