Merge "Refactoring daisy CI Jobs"