[Task]Fix system integration issues

[artofimagination]

Describe why the task has to be done
This service has some issues during system integration with other services. Need fixing