KRACOEUS-7120: more service refactoring for s2s