diff --git a/pom.xml b/pom.xml
index 4f5730c..c0059c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -354,7 +354,7 @@
             </activation>
             <properties>
                 <lombok.version>1.18.44</lombok.version>
-                <java-service.version>1.9.0</java-service.version>
+                <java-service.version>2.0.0</java-service.version>
                 <java-design.version>1.9.0</java-design.version>
                 <picocli.version>4.7.7</picocli.version>
             </properties>
diff --git a/src/main/java/nbbrd/console/properties/ConsoleProperties.java b/src/main/java/nbbrd/console/properties/ConsoleProperties.java
index 4e06c57..37854b7 100644
--- a/src/main/java/nbbrd/console/properties/ConsoleProperties.java
+++ b/src/main/java/nbbrd/console/properties/ConsoleProperties.java
@@ -18,12 +18,12 @@
 
 import internal.console.properties.ConsolePropertiesSpiLoader;
 import internal.console.properties.FailsafeConsolePropertiesSpi;
+import lombok.NonNull;
 import nbbrd.design.ThreadSafe;
 import nbbrd.service.Quantifier;
 import nbbrd.service.ServiceDefinition;
 import nbbrd.service.ServiceFilter;
 import nbbrd.service.ServiceSorter;
-import lombok.NonNull;
 import org.jspecify.annotations.Nullable;
 
 import java.nio.charset.Charset;
@@ -32,6 +32,8 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * This class allows to retrieve some console properties such as size and
  * encoding.
@@ -51,7 +53,7 @@ public final class ConsoleProperties {
     public static ConsoleProperties ofServiceLoader() {
         return ConsoleProperties
                 .builder()
-                .providers(new ConsolePropertiesSpiLoader().get())
+                .providers(ConsolePropertiesSpiLoader.load().stream().map(FailsafeConsolePropertiesSpi::wrap).collect(toList()))
                 .build();
     }
 
@@ -121,8 +123,7 @@ private boolean isNotNegative(int value) {
     @ThreadSafe
     @ServiceDefinition(
             loaderName = "internal.console.properties.ConsolePropertiesSpiLoader",
-            quantifier = Quantifier.MULTIPLE,
-            wrapper = FailsafeConsolePropertiesSpi.class
+            quantifier = Quantifier.MULTIPLE
     )
     public interface Spi {