diff --git a/bootique-aws-s3/src/main/java/io/bootique/aws/s3/AwsS3ModuleProvider.java b/bootique-aws-s3/src/main/java/io/bootique/aws/s3/AwsS3ModuleProvider.java
index d3a1d3d..f80ba47 100644
--- a/bootique-aws-s3/src/main/java/io/bootique/aws/s3/AwsS3ModuleProvider.java
+++ b/bootique-aws-s3/src/main/java/io/bootique/aws/s3/AwsS3ModuleProvider.java
@@ -20,12 +20,15 @@
 package io.bootique.aws.s3;
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
+import io.bootique.bootstrap.BuiltModule;
 
 public class AwsS3ModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsS3Module();
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsS3Module())
+                .provider(this)
+                .description("Provides integration with AWS S3 client v1.")
+                .build();
     }
 }
diff --git a/bootique-aws-secrets/src/main/java/io/bootique/aws/secrets/AwsSecretsModuleProvider.java b/bootique-aws-secrets/src/main/java/io/bootique/aws/secrets/AwsSecretsModuleProvider.java
index 76822c7..6a2200b 100644
--- a/bootique-aws-secrets/src/main/java/io/bootique/aws/secrets/AwsSecretsModuleProvider.java
+++ b/bootique-aws-secrets/src/main/java/io/bootique/aws/secrets/AwsSecretsModuleProvider.java
@@ -19,11 +19,7 @@
 package io.bootique.aws.secrets;
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
+import io.bootique.bootstrap.BuiltModule;
 
 /**
  * @since 2.0.B1
@@ -31,12 +27,11 @@
 public class AwsSecretsModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsSecretsModule();
-    }
-
-    @Override
-    public Map<String, Type> configs() {
-        return Collections.singletonMap("awssecrets", AwsSecretsFactory.class);
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsSecretsModule())
+                .provider(this)
+                .description("Provides integration with AWS Secrets client v1.")
+                .config("awssecrets", AwsSecretsFactory.class)
+                .build();
     }
 }
diff --git a/bootique-aws/src/main/java/io/bootique/aws/AwsModuleProvider.java b/bootique-aws/src/main/java/io/bootique/aws/AwsModuleProvider.java
index 9e811c0..0d9a67f 100644
--- a/bootique-aws/src/main/java/io/bootique/aws/AwsModuleProvider.java
+++ b/bootique-aws/src/main/java/io/bootique/aws/AwsModuleProvider.java
@@ -21,21 +21,16 @@
 
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
+import io.bootique.bootstrap.BuiltModule;
 
 public class AwsModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsModule();
-    }
-
-    @Override
-    public Map<String, Type> configs() {
-        return Collections.singletonMap("aws", AwsConfigFactory.class);
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsModule())
+                .provider(this)
+                .description("Provides integration with AWS client v1.")
+                .config("aws", AwsConfigFactory.class)
+                .build();
     }
 }
diff --git a/bootique-aws2-s3/src/main/java/io/bootique/aws2/s3/AwsS3ModuleProvider.java b/bootique-aws2-s3/src/main/java/io/bootique/aws2/s3/AwsS3ModuleProvider.java
index 04ee61f..7b9548f 100644
--- a/bootique-aws2-s3/src/main/java/io/bootique/aws2/s3/AwsS3ModuleProvider.java
+++ b/bootique-aws2-s3/src/main/java/io/bootique/aws2/s3/AwsS3ModuleProvider.java
@@ -20,12 +20,15 @@
 package io.bootique.aws2.s3;
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
+import io.bootique.bootstrap.BuiltModule;
 
 public class AwsS3ModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsS3Module();
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsS3Module())
+                .provider(this)
+                .description("Provides integration with AWS S3 client v2.")
+                .build();
     }
 }
diff --git a/bootique-aws2-secrets/src/main/java/io/bootique/aws2/secrets/AwsSecretsModuleProvider.java b/bootique-aws2-secrets/src/main/java/io/bootique/aws2/secrets/AwsSecretsModuleProvider.java
index 125f05b..8d4ba49 100644
--- a/bootique-aws2-secrets/src/main/java/io/bootique/aws2/secrets/AwsSecretsModuleProvider.java
+++ b/bootique-aws2-secrets/src/main/java/io/bootique/aws2/secrets/AwsSecretsModuleProvider.java
@@ -19,11 +19,7 @@
 package io.bootique.aws2.secrets;
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
+import io.bootique.bootstrap.BuiltModule;
 
 /**
  * @since 3.0
@@ -31,12 +27,11 @@
 public class AwsSecretsModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsSecretsModule();
-    }
-
-    @Override
-    public Map<String, Type> configs() {
-        return Collections.singletonMap("awssecrets", AwsSecretsFactory.class);
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsSecretsModule())
+                .provider(this)
+                .description("Provides integration with AWS Secrets client v2.")
+                .config("awssecrets", AwsSecretsFactory.class)
+                .build();
     }
 }
diff --git a/bootique-aws2/src/main/java/io/bootique/aws2/AwsModuleProvider.java b/bootique-aws2/src/main/java/io/bootique/aws2/AwsModuleProvider.java
index 43b3cbc..6d0037b 100644
--- a/bootique-aws2/src/main/java/io/bootique/aws2/AwsModuleProvider.java
+++ b/bootique-aws2/src/main/java/io/bootique/aws2/AwsModuleProvider.java
@@ -21,21 +21,16 @@
 
 
 import io.bootique.BQModuleProvider;
-import io.bootique.di.BQModule;
-
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Map;
+import io.bootique.bootstrap.BuiltModule;
 
 public class AwsModuleProvider implements BQModuleProvider {
 
     @Override
-    public BQModule module() {
-        return new AwsModule();
-    }
-
-    @Override
-    public Map<String, Type> configs() {
-        return Collections.singletonMap("aws", AwsConfigFactory.class);
+    public BuiltModule buildModule() {
+        return BuiltModule.of(new AwsModule())
+                .provider(this)
+                .description("Provides integration with AWS client v2.")
+                .config("aws", AwsConfigFactory.class)
+                .build();
     }
 }