Prep for CI build