LPS-41857 Improve consistency. Local service shoul be used