Rework the CI pipeline