diff --git a/snapshot/guide/configurationreference.html b/snapshot/guide/configurationreference.html
index 29ae988f..f77cb2c4 100644
--- a/snapshot/guide/configurationreference.html
+++ b/snapshot/guide/configurationreference.html
@@ -51,9 +51,9 @@ <h1>Configuration Reference</h1>
             </div>
 <div class="sect2">
 <h3 id="_micronaut_rabbitmq_config_properties">Micronaut Rabbitmq Config Properties</h3>
-<a id="io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration" href="#io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration">&#128279;</a>
+<a id="io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration" href="#io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/SingleRabbitConnectionFactoryConfig.DefaultChannelPoolConfiguration.html">SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration</a></caption>
+<caption class="title">Table 1. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.DefaultRpcConfiguration.html">ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -68,8 +68,8 @@ <h3 id="_micronaut_rabbitmq_config_properties">Micronaut Rabbitmq Config Propert
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.channel-pool.max-idle-channels</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Integer</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.servers.*.rpc.timeout</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.Duration</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 </tbody>
@@ -319,9 +319,9 @@ <h3 id="_micronaut_rabbitmq_config_properties">Micronaut Rabbitmq Config Propert
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
-<a id="io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration" href="#io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration">&#128279;</a>
+<a id="io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration" href="#io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 3. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.DefaultRpcConfiguration.html">ClusterRabbitConnectionFactoryConfig$DefaultRpcConfiguration</a></caption>
+<caption class="title">Table 3. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/SingleRabbitConnectionFactoryConfig.DefaultRpcConfiguration.html">SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -336,16 +336,64 @@ <h3 id="_micronaut_rabbitmq_config_properties">Micronaut Rabbitmq Config Propert
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.servers.*.rpc.timeout</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.rpc.timeout</code></p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">java.time.Duration</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
+<a id="io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration" href="#io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 4. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.DefaultChannelPoolConfiguration.html">ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.servers.*.channel-pool.max-idle-channels</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Integer</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
+<a id="io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration" href="#io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration">&#128279;</a>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 5. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/SingleRabbitConnectionFactoryConfig.DefaultChannelPoolConfiguration.html">SingleRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration</a></caption>
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Property</th>
+<th class="tableblock halign-left valign-top">Type</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.channel-pool.max-idle-channels</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Integer</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+</tbody>
+</table>
+<div style="page-break-after: always;"></div>
 <a id="io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig" href="#io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig">&#128279;</a>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 4. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.html">ClusterRabbitConnectionFactoryConfig</a></caption>
+<caption class="title">Table 6. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.html">ClusterRabbitConnectionFactoryConfig</a></caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -587,54 +635,6 @@ <h3 id="_micronaut_rabbitmq_config_properties">Micronaut Rabbitmq Config Propert
 </tbody>
 </table>
 <div style="page-break-after: always;"></div>
-<a id="io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration" href="#io.micronaut.rabbitmq.connect.SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 5. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/SingleRabbitConnectionFactoryConfig.DefaultRpcConfiguration.html">SingleRabbitConnectionFactoryConfig$DefaultRpcConfiguration</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.rpc.timeout</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.time.Duration</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
-<a id="io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration" href="#io.micronaut.rabbitmq.connect.ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration">&#128279;</a>
-<table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 6. Configuration Properties for <a href="../api/io/micronaut/rabbitmq/connect/ClusterRabbitConnectionFactoryConfig.DefaultChannelPoolConfiguration.html">ClusterRabbitConnectionFactoryConfig$DefaultChannelPoolConfiguration</a></caption>
-<colgroup>
-<col style="width: 33.3333%;">
-<col style="width: 33.3333%;">
-<col style="width: 33.3334%;">
-</colgroup>
-<thead>
-<tr>
-<th class="tableblock halign-left valign-top">Property</th>
-<th class="tableblock halign-left valign-top">Type</th>
-<th class="tableblock halign-left valign-top">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>rabbitmq.servers.*.channel-pool.max-idle-channels</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">java.lang.Integer</p></td>
-<td class="tableblock halign-left valign-top"></td>
-</tr>
-</tbody>
-</table>
-<div style="page-break-after: always;"></div>
 </div>
         </div>
     </div>