EZP-20321: Adapted dependency injection settings