diff --git a/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
index 62089217..0072077e 100644
--- a/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1 +1,3 @@
-configuration-properties.classes=org.springframework.cloud.fn.consumer.mongo.MongoDbConsumerProperties
+configuration-properties.classes=org.springframework.cloud.fn.consumer.mongo.MongoDbConsumerProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties
+
diff --git a/applications/source/mongodb-source/README.adoc b/applications/source/mongodb-source/README.adoc
index 92633ae2..67132d46 100644
--- a/applications/source/mongodb-source/README.adoc
+++ b/applications/source/mongodb-source/README.adoc
@@ -13,11 +13,31 @@ The **$$mongodb$$** $$source$$ has the following options:
 
 
 //tag::configuration-properties[]
-$$mongodb.supplier.collection$$:: $$The MongoDB collection to query.$$ *($$String$$, default: `$$<none>$$`)*
-$$mongodb.supplier.query$$:: $$The MongoDB query.$$ *($$String$$, default: `$${ }$$`)*
-$$mongodb.supplier.query-expression$$:: $$The SpEL expression in MongoDB query DSL style.$$ *($$Expression$$, default: `$$<none>$$`)*
-$$mongodb.supplier.split$$:: $$Whether to split the query result as individual messages.$$ *($$Boolean$$, default: `$$true$$`)*
-$$mongodb.supplier.update-expression$$:: $$The SpEL expression in MongoDB update DSL style.$$ *($$Expression$$, default: `$$<none>$$`)*
+Properties grouped by prefix:
+
+
+=== mongodb.supplier
+
+$$collection$$:: $$The MongoDB collection to query.$$ *($$String$$, default: `$$<none>$$`)*
+$$query$$:: $$The MongoDB query.$$ *($$String$$, default: `$${ }$$`)*
+$$query-expression$$:: $$The SpEL expression in MongoDB query DSL style.$$ *($$Expression$$, default: `$$<none>$$`)*
+$$split$$:: $$Whether to split the query result as individual messages.$$ *($$Boolean$$, default: `$$true$$`)*
+$$update-expression$$:: $$The SpEL expression in MongoDB update DSL style.$$ *($$Expression$$, default: `$$<none>$$`)*
+
+=== spring.data.mongodb
+
+$$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$<none>$$`)*
+$$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$database$$:: $$Database name.$$ *($$String$$, default: `$$<none>$$`)*
+$$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class<?>$$, default: `$$<none>$$`)*
+$$grid-fs-database$$:: $$<documentation missing>$$ *($$String$$, default: `$$<none>$$`)*
+$$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
+$$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$<none>$$`)*
+$$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
+$$uri$$:: $$Mongo database URI. Cannot be set with host, port, credentials and replica set name.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)*
+$$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
+$$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)*
 //end::configuration-properties[]
 
 Also see the https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html[Spring Boot Documentation] for additional `MongoProperties` properties.
diff --git a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
index 9179cf5b..5123e6aa 100644
--- a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
@@ -1 +1,3 @@
-configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties
+configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties
+
diff --git a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
index 9179cf5b..5123e6aa 100644
--- a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1 +1,3 @@
-configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties
+configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties
+