CI enablement work