Enhancing CI build