Migrate to generic pipeline instead of specific pipeline