Continuous integration factories refactor