LPS-44593 Use the new logic in services