Revisiting the pipeline code for CI