Task us22 ingest sevice refactoring

copy-paste