diff --git a/README.md b/README.md
index 274d7d86a..f18407b43 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ This is a fork of the RestComm jDiameter Stack with a couple of enhancements don
 - Added Quarkus Extension
 - Updated all the dependencies to latest versions
 - Removed support for SCTP protocol (Not used and deprecated for 5G)
+- Reworked the jdiameter-ha component to use Infinispan as the caching provider
 
 The project was only started in Jul 2024. The enhancement above is done, but I still need to implement a CI/CD pipeline
 for the project and push the artefacts to a public repository.
diff --git a/core/jdiameter-ha/impl/src/main/resources/jdiameter/reflect-config.json b/core/jdiameter-ha/impl/src/main/resources/jdiameter/reflect-config.json
new file mode 100644
index 000000000..14210f964
--- /dev/null
+++ b/core/jdiameter-ha/impl/src/main/resources/jdiameter/reflect-config.json
@@ -0,0 +1,20 @@
+[
+  {
+    "name": "org.jdiameter.impl.ha.data.CachedSessionDatasourceImpl.class",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "org.jdiameter.impl.ha.timer.class",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  }
+]
diff --git a/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/DictionarySingleton.java b/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/DictionarySingleton.java
index 3bf5ced09..81fd3fe92 100644
--- a/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/DictionarySingleton.java
+++ b/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/DictionarySingleton.java
@@ -22,13 +22,13 @@
 
 package org.jdiameter.client.impl;
 
-import java.io.InputStream;
-
 import org.jdiameter.api.InternalException;
 import org.jdiameter.api.validation.Dictionary;
 import org.jdiameter.api.validation.ValidatorLevel;
 import org.jdiameter.common.impl.validation.DictionaryImpl;
 
+import java.io.InputStream;
+
 /**
  * Util class. Makes it easier to access Dictionary instance as singleton.
  *
@@ -37,32 +37,39 @@
  * @since 1.5.4.0-build404
  */
 @SuppressWarnings("all") //3rd party lib
-public class DictionarySingleton {
+public class DictionarySingleton
+{
 
-    private DictionarySingleton() {
+    private DictionarySingleton()
+    {
         // defeat instantiation
     }
 
-    public static Dictionary getDictionary() {
+    public static Dictionary getDictionary()
+    {
         return DictionaryImpl.getInstance((String) null);
     }
 
-    public static Dictionary getDictionary(String confFile) {
+    public static Dictionary getDictionary(String confFile)
+    {
         return DictionaryImpl.getInstance(confFile);
     }
 
-    public static Dictionary getDictionary(InputStream is) {
+    public static Dictionary getDictionary(InputStream is)
+    {
         return DictionaryImpl.getInstance(is);
     }
 
     static void init(String clazz, boolean validatorEnabled, ValidatorLevel validatorSendLevel,
-            ValidatorLevel validatorReceiveLevel) throws InternalException {
+                     ValidatorLevel validatorReceiveLevel) throws InternalException
+    {
         try {
-            Class.forName(clazz).getMethod("getInstance", String.class).invoke(null, new Object[] { null });
+            Class.forName(clazz).getMethod("getInstance", String.class).invoke(null, new Object[]{null});
             DictionaryImpl.INSTANCE.setEnabled(validatorEnabled);
             DictionaryImpl.INSTANCE.setSendLevel(validatorSendLevel);
             DictionaryImpl.INSTANCE.setReceiveLevel(validatorReceiveLevel);
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             throw new InternalException(e);
         }
     }
diff --git a/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/reflect-config.json b/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/reflect-config.json
deleted file mode 100644
index cbe935b51..000000000
--- a/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/reflect-config.json
+++ /dev/null
@@ -1,227 +0,0 @@
-[
-  {
-    "name": "org.jdiameter.client.impl.helpers.AssemblerImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.MetaDataImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.io.TransportLayerFactory",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.fsm.FsmFactoryImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.RouterImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.NetworkImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.OverloadManagerImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.MutablePeerTableImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.client.impl.parser.MessageParser",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.client.impl.parser.ElementParser",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.client.impl.transport.tcp.TCPClientConnection",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.io.tcp.NetworkGuard",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.client.impl.SessionFactoryImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.statistic.StatisticManagerImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.client.impl.controller.RealmTableImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.agent.RedirectAgentImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.MutablePeerTableImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.agent.AgentConfigurationImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.server.impl.agent.ProxyAgentImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.data.LocalDataSource",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.timer.LocalTimerFacilityImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.concurrent.ConcurrentFactory",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.statistic.StatisticProcessorImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.validation.DictionaryImpl",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  },
-  {
-    "name": "org.jdiameter.common.impl.concurrent.ConcurrentEntityFactory",
-    "allDeclaredConstructors": true,
-    "allPublicConstructors": true,
-    "allDeclaredMethods": true,
-    "allPublicMethods": true,
-    "allDeclaredFields": true,
-    "allPublicFields": true
-  }
-]
diff --git a/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/resource-config.json b/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/resource-config.json
deleted file mode 100644
index b65d1e5dd..000000000
--- a/core/jdiameter/impl/src/main/resources/META-INF/native-image/org/jdiameter/resource-config.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "resources": {
-    "includes": [
-      {
-        "pattern": ".*xsd$"
-      }
-    ]
-  }
-}
diff --git a/docs/modules/ROOT/pages/Quarkus/Implementing-Diameter-Service.adoc b/docs/modules/ROOT/pages/Quarkus/Implementing-Diameter-Service.adoc
index d2b7c7a47..82a55461a 100644
--- a/docs/modules/ROOT/pages/Quarkus/Implementing-Diameter-Service.adoc
+++ b/docs/modules/ROOT/pages/Quarkus/Implementing-Diameter-Service.adoc
@@ -1,44 +1,96 @@
 include::../includes/attributes.adoc[]
-= Implementing a Diameter Service
-Diameter implementations are exposed as CDI beans are automatically registered and started
+= {product-name}
 
-To implement a service a class needs to be defined and annotated with `@DiameterService` and `@DiameterServiceOptions`.
-If `@DiameterServiceOption` is not specified the default config profile will be used.
-Only one Diameter service combination of application type and mode can be defined at any given time.
-For example only one CAA / Server service can be defined and a `DiameterConfigException` will be generated if additional one is defined.
-It is however allowed to define additional Diameter Services for other Application Type and mode combination on the same Diameter stack, but not in the same service.
+The Diameter protocol is a computer networking protocol for Authentication, Authorization and Accounting, as defined in link:https://datatracker.ietf.org/doc/html/rfc6733[RFC6733].
+It is extensively used in the 3GPP telecommunication industry.
 
-TIP: For clarity, it is perfectly legal to to have two Diameter Services, one for CAA / Client and another for CAA / Server, or any other combination of application type and mode as long as there is only one per service per diameter stack.
+JDiameter is an existing Java Diameter stack that supports the protocol.
+The origional RestComm implementation (https://github.com/RestComm/jdiameter) is quite old, and active support for it has stopped.
 
-The DiameterService interceptor will initialise all the configured applications and *start* the Diameter stack (if not already started).
-In addition to registering the session factories it will also register a Network Listener for each
+The Quarkus Diameter extension has updated the JDiameter implementation so that it can be used in both a Quarkus JVM and a Native application.
 
-== Example
+== Installation
+
+If you want to use this extension, you need to add the io.quarkiverse.jdiameter:quarkus-diameter extension first to your build file.
+
+For instance, with Maven, add the following dependency to your POM file:
+
+[source,xml]
+----
+<properties>
+    <quarkus.jdiameter.version>2.0.0</quarkus.jdiameter.version>
+</properties>
+
+<dependency>
+    <groupId>io.quarkiverse.jdiameter</groupId>
+    <artifactId>quarkus-diameter</artifactId>
+    <version>${quarkus.jdiameter.version}</version>
+</dependency>
+----
+
+== Implementing a Diameter Service
+
+To implement a Diameter service, a class needs to be defined and annotated with `@DiameterService` and optionally `@DiameterServiceOptions`.
+
+The `@DiameterServiceOption` annotation is used, among other, to specific the Diameter configuration profile to use for the service, and if it is not specified the service will use the default configuration profile.
+
+The type of Diameter service is determined by the xref:_application_session_types[Diameter Application Session Listener] interfaces implemented by the service.
+
+The DiameterService interceptor will initialise all the configured services and *start* the Diameter stack (if not already started).
+
+=== Example
 
 [source,java]
 ----
-@DiameterService <1>
-@DiameterServiceOption(config = "client1") <2>
-public class MyDiameterService implements ClientCCASessionListener <3>
+
+@DiameterService <1> @DiameterServiceOption(config = "client1") <2> public class MyDiameterService implements ClientCCASessionListener <3>
 {
-	@Override
-	public void doCreditControlAnswer(ClientCCASession session, JCreditControlRequest request, JCreditControlAnswer answer) throws InternalException
-	{
-	    //...
-	}
-}
+@Override public void doCreditControlAnswer(ClientCCASession session, JCreditControlRequest request, JCreditControlAnswer answer) throws InternalException
+{
+//...
+} }
+
 ----
 
 <1> Marking the class as a diameter service
 <2> The optional configuration option to apply to the diameter service.
 If not define the <default> configuration will be used.
 <3> Implements the the SessionListener associated with the `Session Type`.
-(See List below)
+(See xref:_application_session_types[List] below)
+
+== Application Session Types
+
+The session listener determines the Diameter service session type it implements.
+The list below contains all the session types currently supported by the Diameter Service implementation.
+
+.Supported Application Session type.
+[options="header"]
+|===
+| Session Type | Server Session Interface | Client Session Interface | Application | Reference
+| Acc | ServerAccSessionListener | ClientAccSessionListener | AccountingId[0:3] | link:https://datatracker.ietf.org/doc/html/rfc6733[RFC6733]
+| Auth | ServerAuthSessionListener | ClientAuthSessionListener | Internal | link:https://datatracker.ietf.org/doc/html/rfc6733[RFC6733]
+| CCA | ServerCCASessionListener | ClientCCASessionListener | AuthId[0:4] | link:https://datatracker.ietf.org/doc/html/rfc4006[RFC4006]
+| Gx | ServerGxSessionListener | ClientGxSessionListener | - | -
+| Rx |  ClientRxSessionListener | ClientRxSessionListener | - | -
+| S6a |  ServerS6aSessionListener | ClientS6aSessionListener | - | -
+| Gq | ServerGqSessionListener | ClientGqSessionListener | - | -
+| Sh | ServerShSessionListener | ClientShSessionListener | - | -
+| CxDx | ServerCxDxSessionListener | ClientCxDxSessionListener | AuthId[13019:16777216] AuthId[10415:16777216] | TS.29228
+| S13 | ServerS13SessionListener | ClientS13SessionListener | - | -
+| Ro | ServerRoSessionListener | ClientRoSessionListener | AuthId[10415:4] | TS.32240
+| Rf | ServerRfSessionListener | ClientRfSessionListener | AccountingId[10415:3] | TS.32240
+|===
+
+IMPORTANT: Only *one* implementation of a session listener per diameter stack is allowed per application.
+If the build phase detected that the same session listener is implemented more than once for the *same* diameter stack a `DiameterConfigException` exception will be generated.
+
+TIP: A Diameter service may implement more than one session listener.
 
 == Diameter Server mode
 
-When the diameter stack is started in SERVER mode, the Diameter Service interceptor automatically creates a network listener for defined Diameter Service.
-The interceptor will skip creating a listener if it detects that the Diameter Service has implemented the `NetworkListener` interface.
+If a Diameter service implements any of the ServerXXXSessionListeners the Diameter Service interceptor automatically creates a network listener for that Diameter service.
+
+NOTE: The interceptor will skip creating a listener if it detects that the Diameter Service has implemented the `NetworkListener` interface.
 
 TIP: In most cases you do not need to implement your own `NetworkListener` and you can let the interceptor create one for you!
 
@@ -55,8 +107,7 @@ TIP: The stack will only be active if there is a defined DiameterService for the
 
 @ApplicationScoped public class Demo
 {
-    @DiameterConfig <1>
-    Stack stack;
+@DiameterConfig <1> Stack stack;
 
     @DiameterConfig("test2") <2>
     Configuration test2Config;
@@ -68,18 +119,46 @@ TIP: The stack will only be active if there is a defined DiameterService for the
 <1> Injecting the Diameter stack associated with the "<default>" configuration.
 <2> Injecting the Diameter configuration for the "test2" configuration.
 
-== Application Session Types
+== Using {product-name} in an high availability environment
 
-.Supported Application Session type.
-|===
-| *Session Type* | *Server Session Interface* | *Client Session Interface*
-| Credit Control Application (CCA) | ServerCCASessionListener | ClientCCASessionListener
-| Rx |  ClientRxSessionListener | ClientRxSessionListener
-| S6a |  ServerS6aSessionListener | ClientS6aSessionListener
-| Gq | ServerAuthSessionListener | ClientAuthSessionListener
-|===
+The {product-name} keeps track of each active session by storing the session information for each session. {product-name} also sets various timers linked to these session.
+In a standalone mode the session state is stored locally and the timers are defined in the local JVM.
+To use the diameter stack in a high availability (HA) mode where two or more nodes are used in a load balance or failover mode the sessions cannot be store in local ram.
+
+To use {product-name} in an HA environment the HA extensions must be loaded.
+The HA extensions stores the session state in an Infinispan Cache and makes use of the Infinispan timers to implement the diameter timers.
+The HA extensions stores the session information in a remote cache called `diameter`.
+
+TIP: The cache used can be changed by setting the `quarkus.diameter.parameter.caching-name` property
+
+The extension are not automatically included by the Quarkus extension and the following maven dependencies needs to be added to application pom file to use the extensions.
+
+[source,xml]
+----
+<dependency>
+    <groupId>io.quarkiverse.diameter</groupId>
+    <artifactId>jdiameter-ha-api</artifactId>
+    <version>${quarkus.jdiameter.version}</version>
+</dependency>
+<dependency>
+    <groupId>io.quarkiverse.diameter</groupId>
+    <artifactId>jdiameter-ha-impl</artifactId>
+    <version>${quarkus.jdiameter.version}</version>
+</dependency>
+----
+
+To use the HA components the configuration needs to be updated as follows:
+
+[source,properties]
+----
+quarkus.diameter.parameter.caching-name=drasessions  <1>
+meter.extensions.session-datasource=org.jdiameter.impl.ha.data.CachedSessionDatasourceImpl
+quarkus.diameter.extensions.timer-facility=org.jdiameter.impl.ha.timer.ReplicatedTimerFacilityImpl
+----
+
+<1> This option change the caching name from the default `diameter` to drasessions.
 
-== Using TLS
+NOTE: The HA implementation dependents on the Quarkus Infinispan client
 
 == Example Configuration
 
@@ -88,48 +167,50 @@ One is the default config and the other is named config called 'test1'.
 
 [source,properties]
 ----
-diameter.local-peer.uri=aaa://ocsclient:1812
-diameter.local-peer.ip-addresses=0.0.0.0, 127.0.0.1
-diameter.local-peer.realm=server.test.com
-diameter.local-peer.product-name=Diameter Test Client
-diameter.local-peer.firmware-revision=1
-diameter.local-peer.applications.0.auth-appl-id=4
-diameter.local-peer.applications.1.auth-appl-id=4
-diameter.local-peer.applications.1.vendor-id=10415
-diameter.parameter.use-virtual-threads=true
-diameter.network.peers.peer-uri=aaa://ocs.test.org:3868
-diameter.network.peers.ip=127.0.0.1
-diameter.network.peers.attempt-connect=true
-diameter.network.peers.rating=0
-diameter.network.realms.realm-name=server.test.com
-diameter.network.realms.peers=192.168.241.1,localhost
-diameter.network.realms.local-action=local
-diameter.network.realms.dynamic=false
-diameter.network.realms.exp-time=1
-diameter.network.realms.application-id.auth-appl-id=4
-
-diameter.test1.local-peer.uri=aaa://ocsclient:1813
-diameter.test1.local-peer.ip-addresses[0]=0.0.0.0, 127.0.0.1
-diameter.test1.local-peer.realm=server.test.com
-diameter.test1.local-peer.product-name=Diameter Test Client
-diameter.test1.local-peer.firmware-revision=1
-diameter.test1.local-peer.applications.0.auth-appl-id=4
-diameter.test1.local-peer.applications.1.auth-appl-id=4
-diameter.test1.local-peer.applications.1.vendor-id=10415
-diameter.test1.parameter.use-virtual-threads=true
-diameter.test1.network.peers.peer-uri=aaa://ocs.test.org:3868
-diameter.test1.network.peers.ip=127.0.0.1
-diameter.test1.network.peers.attempt-connect=true
-diameter.test1.network.peers.rating=0
-diameter.test1.network.realms.realm-name=server.test.com
-diameter.test1.network.realms.peers=192.168.241.1,localhost
-diameter.test1.network.realms.local-action=local
-diameter.test1.network.realms.dynamic=false
-diameter.test1.network.realms.exp-time=1
-diameter.test1.network.realms.application-id.auth-appl-id=4
+quarkus.diameter.local-peer.uri=aaa://ocsclient:1812
+quarkus.diameter.local-peer.ip-addresses=0.0.0.0, 127.0.0.1
+quarkus.diameter.local-peer.realm=server.test.com
+quarkus.diameter.local-peer.product-name=Diameter Test Client
+quarkus.diameter.local-peer.firmware-revision=1
+quarkus.diameter.local-peer.applications.0.auth-appl-id=4
+quarkus.diameter.local-peer.applications.1.auth-appl-id=4
+quarkus.diameter.local-peer.applications.1.vendor-id=10415
+
+quarkus.diameter.parameter.use-virtual-threads=true
+
+quarkus.diameter.network.peers.peer-uri=aaa://ocs.test.org:3868
+quarkus.diameter.network.peers.ip=127.0.0.1
+quarkus.diameter.network.peers.attempt-connect=true
+quarkus.diameter.network.peers.rating=0
+
+quarkus.diameter.network.realms."server.test.com".peers=192.168.241.1,localhost
+quarkus.diameter.network.realms."server.test.com".local-action=local
+quarkus.diameter.network.realms."server.test.com".dynamic=false
+quarkus.diameter.network.realms."server.test.com".exp-time=1
+quarkus.diameter.network.realms."server.test.com".application-id.auth-appl-id=4
+
+quarkus.diameter.test1.local-peer.uri=aaa://ocsclient:1813
+quarkus.diameter.test1.local-peer.ip-addresses[0]=0.0.0.0, 127.0.0.1
+quarkus.diameter.test1.local-peer.realm=server.test.com
+quarkus.diameter.test1.local-peer.product-name=Diameter Test Client
+quarkus.diameter.test1.local-peer.firmware-revision=1
+quarkus.diameter.test1.local-peer.applications.0.auth-appl-id=4
+
+quarkus.diameter.test1.parameter.use-virtual-threads=true
+
+quarkus.diameter.test1.network.peers.peer-uri=aaa://ocs.test.org:3868
+quarkus.diameter.test1.network.peers.ip=127.0.0.1
+quarkus.diameter.test1.network.peers.attempt-connect=true
+quarkus.diameter.test1.network.peers.rating=0
+
+quarkus.diameter.test1.network.realms."server.test.com".peers=192.168.241.1,localhost
+quarkus.diameter.test1.network.realms."server.test.com".local-action=local
+quarkus.diameter.test1.network.realms."server.test.com".dynamic=false
+quarkus.diameter.test1.network.realms."server.test.com".exp-time=1
+quarkus.diameter.test1.network.realms."server.test.com".application-id.auth-appl-id=4
 ----
 
-TIP:For more information about the extension configuration please refer to the <<configuration-reference,Configuration Reference>>.
+TIP: For more information about the extension configuration please refer to the <<configuration-reference,Configuration Reference>>.
 
 [[configuration-reference]]
 include::../includes/quarkus-diameter.adoc[leveloffset=+1]
diff --git a/docs/modules/ROOT/pages/Section-JDiameter-Source_Overview.adoc b/docs/modules/ROOT/pages/Section-JDiameter-Source_Overview.adoc
index 600bfc075..74bccfabb 100644
--- a/docs/modules/ROOT/pages/Section-JDiameter-Source_Overview.adoc
+++ b/docs/modules/ROOT/pages/Section-JDiameter-Source_Overview.adoc
@@ -283,13 +283,13 @@ In the table below, you can find session factories provided by current implement
 [cols="1,1,1,1",frame="all",options="header"]
 |===
 | Factory class | Application type & id | Application | Reference
-| org.jdiameter.common.impl.app.acc.AccSessionFactoryImpl | AccountingId[0:3] | Acc | FC3588
+| org.jdiameter.common.impl.app.acc.AccSessionFactoryImpl | AccountingId[0:3] | Acc | RFC3588
 | org.jdiameter.common.impl.app.auth.AuthSessionFactoryImpl | Specific | Auth | RFC3588
 | org.jdiameter.common.impl.app.cca.CCASessionFactoryImpl | AuthId[0:4] | CCA | RFC4006
 | org.jdiameter.common.impl.app.sh.ShSessionFactoryImpl | AuthId[10415:16777217] | Sh | TS.29328, TS.29329
 | org.jdiameter.common.impl.app.cxdx.CxDxSessionFactoryImpl | AuthId[13019:16777216] | Cx | TS.29228, TS.29229
 | org.jdiameter.common.impl.app.cxdx.CxDxSessionFactoryImpl | AuthId[10415:16777216] | Dx | TS.29228, TS.29229
-| org.jdiameter.common.impl.app.acc.AccSessionFactoryImpl | AccountingId[10415:3] | Rf | S.32240
+| org.jdiameter.common.impl.app.acc.AccSessionFactoryImpl | AccountingId[10415:3] | Rf | TS.32240
 | org.jdiameter.common.impl.app.cca.CCASessionFactoryImpl | AuthId[10415:4] | Ro | TS.32240
 |===
 
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc
index bad829b3e..243384474 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-agent.adoc
@@ -10,13 +10,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-config-agent_configuration]]lin
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -24,10 +20,10 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-agent_quarkus-diameter-
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-application-id.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-application-id.adoc
index c9a1ce0a9..0d012ca0c 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-application-id.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-application-id.adoc
@@ -79,13 +79,9 @@ endif::add-copy-button-to-env-var[]
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -93,22 +89,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -116,22 +108,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -139,10 +127,10 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-application-id_quarkus-
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-network.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-network.adoc
index 804b885d2..9eb7f5652 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-network.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-network.adoc
@@ -10,13 +10,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -24,22 +20,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -47,22 +39,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -70,22 +58,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -93,22 +77,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -116,22 +96,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -143,10 +119,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
@@ -157,36 +133,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realm-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -194,22 +143,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -217,23 +162,19 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -241,22 +182,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -264,27 +201,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -292,22 +225,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -315,22 +244,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -338,27 +263,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -366,10 +287,10 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-network_quarkus-diamete
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-peer.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-peer.adoc
index 9156d32dc..e97dfc156 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-peer.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-peer.adoc
@@ -10,13 +10,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-config-peer_configuration]]link
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -24,22 +20,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-n
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -47,22 +39,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-n
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -70,22 +58,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-n
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -93,22 +77,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-n
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -116,22 +96,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-n
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-peer_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -143,10 +119,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-realm.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-realm.adoc
index 68f42735f..e9c6ebe56 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-realm.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-config-realm.adoc
@@ -10,36 +10,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-config-realm_configuration]]lin
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realm-name]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -47,22 +20,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -70,23 +39,19 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -94,22 +59,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -117,27 +78,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -145,22 +102,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -168,22 +121,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -191,27 +140,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -219,10 +164,10 @@ a| [[config-group-io-quarkiverse-diameter-runtime-config-realm_quarkus-diameter-
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-diameter-detail-config.adoc b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-diameter-detail-config.adoc
index 4b089a4a3..896ee7429 100644
--- a/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-diameter-detail-config.adoc
+++ b/docs/modules/ROOT/pages/includes/config-group-io-quarkiverse-diameter-runtime-diameter-detail-config.adoc
@@ -854,13 +854,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-peer-uri]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -868,22 +864,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-rating]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -891,22 +883,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-ip]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -914,22 +902,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-port-range]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -937,22 +921,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -960,22 +940,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -987,10 +963,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
@@ -1001,36 +977,9 @@ h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realm-name]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-peers]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -1038,22 +987,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-local-action]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -1061,23 +1006,19 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-dynamic]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -1085,22 +1026,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-exp-time]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -1108,27 +1045,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -1136,22 +1069,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -1159,22 +1088,18 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -1182,27 +1107,23 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-agent-properties]]`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -1210,10 +1131,10 @@ a| [[config-group-io-quarkiverse-diameter-runtime-diameter-detail-config_quarkus
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/quarkus-diameter-general-config-items.adoc b/docs/modules/ROOT/pages/includes/quarkus-diameter-general-config-items.adoc
index 3477991d9..786635fad 100644
--- a/docs/modules/ROOT/pages/includes/quarkus-diameter-general-config-items.adoc
+++ b/docs/modules/ROOT/pages/includes/quarkus-diameter-general-config-items.adoc
@@ -854,13 +854,9 @@ h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-list-of
 h|Type
 h|Default
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-uri]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-peer-uri]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -868,22 +864,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peer-u
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-rating]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -891,22 +883,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-rating
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-ip]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -914,22 +902,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-ip]]`l
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-range]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-port-range]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -937,22 +921,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-port-r
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attempt-connect]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -960,22 +940,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-attemp
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-tls-configuration-name]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -987,10 +963,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
@@ -1001,36 +977,9 @@ h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-list-o
 h|Type
 h|Default
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realm-name]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-peers]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -1038,22 +987,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-peers
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local-action]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-local-action]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -1061,23 +1006,19 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-local
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynamic]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-dynamic]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -1085,22 +1026,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-dynam
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-time]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-exp-time]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -1108,27 +1045,23 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-exp-t
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -1136,22 +1069,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-appli
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -1159,22 +1088,18 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-appli
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -1182,27 +1107,23 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-appli
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-properties]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-agent-properties]]`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#quarkus-diameter-general-config-items_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -1210,10 +1131,10 @@ a| [[quarkus-diameter-general-config-items_quarkus-diameter-network-realms-agent
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config.adoc b/docs/modules/ROOT/pages/includes/quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config.adoc
index 01346e2c9..80e9c3567 100644
--- a/docs/modules/ROOT/pages/includes/quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config.adoc
+++ b/docs/modules/ROOT/pages/includes/quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config.adoc
@@ -854,13 +854,9 @@ h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_qu
 h|Type
 h|Default
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peer-uri]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-peer-uri]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -868,22 +864,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-rating]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-rating]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -891,22 +883,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-ip]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-ip]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -914,22 +902,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-port-range]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-port-range]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -937,22 +921,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-attempt-connect]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -960,22 +940,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-tls-configuration-name]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -987,10 +963,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
@@ -1001,36 +977,9 @@ h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_qu
 h|Type
 h|Default
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realm-name]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-peers]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-peers]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -1038,22 +987,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-local-action]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-local-action]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -1061,23 +1006,19 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-dynamic]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-dynamic]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -1085,22 +1026,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-exp-time]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-exp-time]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -1108,27 +1045,23 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -1136,22 +1069,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -1159,22 +1088,18 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -1182,27 +1107,23 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-properties]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-agent-properties]]`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -1210,10 +1131,10 @@ a| [[quarkus-diameter-io-quarkiverse-diameter-runtime-diameter-run-time-config_q
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/docs/modules/ROOT/pages/includes/quarkus-diameter.adoc b/docs/modules/ROOT/pages/includes/quarkus-diameter.adoc
index 2d4d5ec3f..abd87a2b0 100644
--- a/docs/modules/ROOT/pages/includes/quarkus-diameter.adoc
+++ b/docs/modules/ROOT/pages/includes/quarkus-diameter.adoc
@@ -854,13 +854,9 @@ h|[[quarkus-diameter_quarkus-diameter-network-peers-list-of-external-peers-and-t
 h|Type
 h|Default
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-peer-uri]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers.peer-uri]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-peer-uri]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-peer-uri[quarkus.diameter.network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-peer-uri[quarkus.diameter."named-config".network.peers.peer-uri]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-peer-uri[quarkus.diameter."named-config".network.peers."peers".peer-uri]`
 
 
 [.description]
@@ -868,22 +864,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-peers-peer-uri]]`link:#quarkus-di
 Specifies the name of the peer in the form of a URI. The structure is "aaa://++[++fqdn++\|++ip++]++:port" (for example, "aaa://192.168.1.1:3868").
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PEER_URI+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PEER_URI+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`aaa://localhost:3868`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-rating]]`link:#quarkus-diameter_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers.rating]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-rating[quarkus.diameter.network.peers."peers".rating]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-rating]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-rating[quarkus.diameter.network.peers."peers".rating]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-rating[quarkus.diameter."named-config".network.peers.rating]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-rating[quarkus.diameter."named-config".network.peers."peers".rating]`
 
 
 [.description]
@@ -891,22 +883,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-peers-rating]]`link:#quarkus-diam
 Specifies the rating of this peer in order to achieve peer priorities/sorting.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_RATING+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__RATING+++`
 endif::add-copy-button-to-env-var[]
 --|int 
 |`1`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-ip]]`link:#quarkus-diameter_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers.ip]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-ip[quarkus.diameter.network.peers."peers".ip]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-ip]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-ip[quarkus.diameter.network.peers."peers".ip]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-ip[quarkus.diameter."named-config".network.peers.ip]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-ip[quarkus.diameter."named-config".network.peers."peers".ip]`
 
 
 [.description]
@@ -914,22 +902,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-peers-ip]]`link:#quarkus-diameter
 Specifies the actual ip for the peer-uri, for example 192.168.1.1
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_IP+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__IP+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-port-range]]`link:#quarkus-diameter_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers.port-range]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-port-range]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-port-range[quarkus.diameter.network.peers."peers".port-range]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-port-range[quarkus.diameter."named-config".network.peers.port-range]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-port-range[quarkus.diameter."named-config".network.peers."peers".port-range]`
 
 
 [.description]
@@ -937,22 +921,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-peers-port-range]]`link:#quarkus-
 Specifies a port range to accept connection override the port number in peer-uri
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_PORT_RANGE+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__PORT_RANGE+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-attempt-connect]]`link:#quarkus-diameter_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers.attempt-connect]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-attempt-connect]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter.network.peers."peers".attempt-connect]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-attempt-connect[quarkus.diameter."named-config".network.peers.attempt-connect]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-attempt-connect[quarkus.diameter."named-config".network.peers."peers".attempt-connect]`
 
 
 [.description]
@@ -960,22 +940,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-peers-attempt-connect]]`link:#qua
 Determines if the stack should try to connect to this peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_ATTEMPT_CONNECT+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__ATTEMPT_CONNECT+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-peers-tls-configuration-name]]`link:#quarkus-diameter_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers.tls-configuration-name]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
+a| [[quarkus-diameter_quarkus-diameter-network-peers-peers-tls-configuration-name]]`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter.network.peers."peers".tls-configuration-name]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers.tls-configuration-name]`
+`link:#quarkus-diameter_quarkus-diameter-network-peers-peers-tls-configuration-name[quarkus.diameter."named-config".network.peers."peers".tls-configuration-name]`
 
 
 [.description]
@@ -987,10 +963,10 @@ If not set and the default TLS configuration is configured (`quarkus.tls.++*++`)
 If no TLS configuration is set, and `quarkus.tls.++*++` is not configured, then, no security will be used
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS_TLS_CONFIGURATION_NAME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_PEERS__PEERS__TLS_CONFIGURATION_NAME+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |
@@ -1001,36 +977,9 @@ h|[[quarkus-diameter_quarkus-diameter-network-realms-list-of-all-realms-that-con
 h|Type
 h|Default
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-realm-name]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms.realm-name]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-realm-name[quarkus.diameter.network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms."realms".realm-name]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-realm-name[quarkus.diameter."named-config".network.realms.realm-name]`
-
-
-[.description]
---
-Contains attributes and elements that describe different realms configured for the Core.
-
-ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++[]
-endif::add-copy-button-to-env-var[]
-ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_REALM_NAME+++`
-endif::add-copy-button-to-env-var[]
---|string 
-|`io.quarkiverse.diameter`
-
-
-a| [[quarkus-diameter_quarkus-diameter-network-realms-peers]]`link:#quarkus-diameter_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms.peers]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-peers]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-peers[quarkus.diameter.network.realms."realms".peers]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-peers[quarkus.diameter.network.realms."realms".peers]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-peers[quarkus.diameter."named-config".network.realms.peers]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-peers[quarkus.diameter."named-config".network.realms."realms".peers]`
 
 
 [.description]
@@ -1038,22 +987,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-peers]]`link:#quarkus-diam
 Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_PEERS+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__PEERS+++`
 endif::add-copy-button-to-env-var[]
 --|string 
 |`localhost`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-local-action]]`link:#quarkus-diameter_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms.local-action]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-local-action]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter.network.realms."realms".local-action]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-local-action[quarkus.diameter."named-config".network.realms.local-action]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-local-action[quarkus.diameter."named-config".network.realms."realms".local-action]`
 
 
 [.description]
@@ -1061,23 +1006,19 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-local-action]]`link:#quark
 Determines the action the Local Peer will play on the specified realm: Act as a LOCAL peer.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_LOCAL_ACTION+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__LOCAL_ACTION+++`
 endif::add-copy-button-to-env-var[]
 -- a|
 `local`, `relay`, `proxy`, `redirect` 
 |`local`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-dynamic]]`link:#quarkus-diameter_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms.dynamic]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-dynamic]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter.network.realms."realms".dynamic]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-dynamic[quarkus.diameter."named-config".network.realms.dynamic]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-dynamic[quarkus.diameter."named-config".network.realms."realms".dynamic]`
 
 
 [.description]
@@ -1085,22 +1026,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-dynamic]]`link:#quarkus-di
 Specifies if this realm is dynamic. That is, peers that connect to peers with this realm name will be added to the realm peer list if not present already.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_DYNAMIC+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__DYNAMIC+++`
 endif::add-copy-button-to-env-var[]
 --|boolean 
 |`false`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-exp-time]]`link:#quarkus-diameter_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms.exp-time]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-exp-time]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter.network.realms."realms".exp-time]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-exp-time[quarkus.diameter."named-config".network.realms.exp-time]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-exp-time[quarkus.diameter."named-config".network.realms."realms".exp-time]`
 
 
 [.description]
@@ -1108,27 +1045,23 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-exp-time]]`link:#quarkus-d
 The time before a peer belonging to this realm is removed if no connection is available. The time is in seconds.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_EXP_TIME+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__EXP_TIME+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`1`
 
 
-h|[[quarkus-diameter_quarkus-diameter-network-realms-application-id-the-applications-supported]]link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-the-applications-supported[The applications supported]
+h|[[quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-the-applications-supported]]link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-the-applications-supported[The applications supported]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms.application-id.vendor-id]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-vendor-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter.network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms.application-id.vendor-id]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-vendor-id[quarkus.diameter."named-config".network.realms."realms".application-id.vendor-id]`
 
 
 [.description]
@@ -1136,22 +1069,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-vendor-id]]
 Specifies the vendor ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_VENDOR_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_VENDOR_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms.application-id.auth-appl-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-auth-appl-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter.network.realms."realms".application-id.auth-appl-id]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms.application-id.auth-appl-id]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-auth-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.auth-appl-id]`
 
 
 [.description]
@@ -1159,22 +1088,18 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-auth-appl-i
 The Authentication Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_AUTH_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_AUTH_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms.application-id.acct-appl-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-acct-appl-id]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter.network.realms."realms".application-id.acct-appl-id]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms.application-id.acct-appl-id]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-application-id-acct-appl-id[quarkus.diameter."named-config".network.realms."realms".application-id.acct-appl-id]`
 
 
 [.description]
@@ -1182,27 +1107,23 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-application-id-acct-appl-i
 The Account Application ID for application definition.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_APPLICATION_ID_ACCT_APPL_ID+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__APPLICATION_ID_ACCT_APPL_ID+++`
 endif::add-copy-button-to-env-var[]
 --|long 
 |`0`
 
 
-h|[[quarkus-diameter_quarkus-diameter-network-realms-agent-the-agent-configuration]]link:#quarkus-diameter_quarkus-diameter-network-realms-agent-the-agent-configuration[The Agent configuration]
+h|[[quarkus-diameter_quarkus-diameter-network-realms-realms-agent-the-agent-configuration]]link:#quarkus-diameter_quarkus-diameter-network-realms-realms-agent-the-agent-configuration[The Agent configuration]
 This configuration section is optional
 h|Type
 h|Default
 
-a| [[quarkus-diameter_quarkus-diameter-network-realms-agent-properties]]`link:#quarkus-diameter_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms.agent."properties"]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
-
-`link:#quarkus-diameter_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
+a| [[quarkus-diameter_quarkus-diameter-network-realms-realms-agent-properties]]`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter.network.realms."realms".agent."properties"]`
 
-`link:#quarkus-diameter_quarkus-diameter-network-realms-agent-properties[quarkus.diameter."named-config".network.realms.agent."properties"]`
+`link:#quarkus-diameter_quarkus-diameter-network-realms-realms-agent-properties[quarkus.diameter."named-config".network.realms."realms".agent."properties"]`
 
 
 [.description]
@@ -1210,10 +1131,10 @@ a| [[quarkus-diameter_quarkus-diameter-network-realms-agent-properties]]`link:#q
 Retrieves the properties of the agent configuration.
 
 ifdef::add-copy-button-to-env-var[]
-Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++[]
+Environment variable: env_var_with_copy_button:+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++[]
 endif::add-copy-button-to-env-var[]
 ifndef::add-copy-button-to-env-var[]
-Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS_AGENT__PROPERTIES_+++`
+Environment variable: `+++QUARKUS_DIAMETER_NETWORK_REALMS__REALMS__AGENT__PROPERTIES_+++`
 endif::add-copy-button-to-env-var[]
 --|link:https://docs.oracle.com/javase/8/docs/api/java/lang/String.html[String]
  
diff --git a/quarkus-diameter/deployment/src/main/java/io/quarkiverse/diameter/deployment/DiameterProcessor.java b/quarkus-diameter/deployment/src/main/java/io/quarkiverse/diameter/deployment/DiameterProcessor.java
index 314c33df2..a8fdbc113 100644
--- a/quarkus-diameter/deployment/src/main/java/io/quarkiverse/diameter/deployment/DiameterProcessor.java
+++ b/quarkus-diameter/deployment/src/main/java/io/quarkiverse/diameter/deployment/DiameterProcessor.java
@@ -14,6 +14,8 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.tls.TlsRegistryBuildItem;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Default;
@@ -22,6 +24,27 @@
 import org.jboss.jandex.DotName;
 import org.jdiameter.api.Configuration;
 import org.jdiameter.api.Stack;
+import org.jdiameter.client.impl.SessionFactoryImpl;
+import org.jdiameter.client.impl.controller.RealmTableImpl;
+import org.jdiameter.client.impl.helpers.AssemblerImpl;
+import org.jdiameter.client.impl.parser.MessageParser;
+import org.jdiameter.client.impl.router.WeightedLeastConnectionsRouter;
+import org.jdiameter.client.impl.router.WeightedRoundRobinRouter;
+import org.jdiameter.client.impl.transport.tcp.TCPClientConnection;
+import org.jdiameter.common.impl.concurrent.ConcurrentEntityFactory;
+import org.jdiameter.common.impl.concurrent.ConcurrentFactory;
+import org.jdiameter.common.impl.data.LocalDataSource;
+import org.jdiameter.common.impl.statistic.StatisticManagerImpl;
+import org.jdiameter.common.impl.statistic.StatisticProcessorImpl;
+import org.jdiameter.common.impl.timer.LocalTimerFacilityImpl;
+import org.jdiameter.common.impl.validation.DictionaryImpl;
+import org.jdiameter.server.impl.*;
+import org.jdiameter.server.impl.agent.AgentConfigurationImpl;
+import org.jdiameter.server.impl.agent.ProxyAgentImpl;
+import org.jdiameter.server.impl.agent.RedirectAgentImpl;
+import org.jdiameter.server.impl.fsm.FsmFactoryImpl;
+import org.jdiameter.server.impl.io.TransportLayerFactory;
+import org.jdiameter.server.impl.io.tcp.NetworkGuard;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,6 +72,53 @@ public FeatureBuildItem feature()
         return new FeatureBuildItem(FEATURE);
     }
 
+    @BuildStep
+    NativeImageResourceBuildItem nativeImageResourceBuildItem()
+    {
+        return new NativeImageResourceBuildItem("META-INF/jdiameter-client.xsd",
+                                                "META-INF/jdiameter-server.xsd",
+                                                "META-INF/version.properties",
+                                                "META-INF/dictionary.xml");
+    }
+
+    @BuildStep
+    ReflectiveClassBuildItem reflection()
+    {
+        return ReflectiveClassBuildItem.builder(ConcurrentEntityFactory.class,
+                                                DictionaryImpl.class,
+                                                StatisticProcessorImpl.class,
+                                                ConcurrentFactory.class,
+                                                LocalTimerFacilityImpl.class,
+                                                LocalDataSource.class,
+                                                ProxyAgentImpl.class,
+                                                AgentConfigurationImpl.class,
+                                                RedirectAgentImpl.class,
+                                                MutablePeerTableImpl.class,
+                                                RealmTableImpl.class,
+                                                StatisticManagerImpl.class,
+                                                SessionFactoryImpl.class,
+                                                NetworkGuard.class,
+                                                TCPClientConnection.class,
+                                                TCPClientConnection.class,
+                                                OverloadManagerImpl.class,
+                                                NetworkImpl.class,
+                                                RouterImpl.class,
+                                                org.jdiameter.client.impl.router.RouterImpl.class,
+                                                FsmFactoryImpl.class,
+                                                org.jdiameter.client.impl.fsm.FsmFactoryImpl.class,
+                                                TransportLayerFactory.class,
+                                                org.jdiameter.client.impl.transport.TransportLayerFactory.class,
+                                                MetaDataImpl.class,
+                                                org.jdiameter.client.impl.MetaDataImpl.class,
+                                                AssemblerImpl.class,
+                                                MessageParser.class,
+                                                WeightedRoundRobinRouter.class,
+                                                WeightedLeastConnectionsRouter.class
+                                               )
+                                       .methods().fields().constructors()
+                                       .build();
+    }
+
     @BuildStep
     public void discoverInjectedClients(CombinedIndexBuildItem index,
                                         BuildProducer<DiameterConfigBuildItem> profiles)
diff --git a/quarkus-diameter/runtime/pom.xml b/quarkus-diameter/runtime/pom.xml
index 121cc02ef..8c5a6db7e 100644
--- a/quarkus-diameter/runtime/pom.xml
+++ b/quarkus-diameter/runtime/pom.xml
@@ -16,6 +16,7 @@
     <properties>
         <quicklyDocs>true</quicklyDocs>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/DiameterServiceInterceptor.java b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/DiameterServiceInterceptor.java
index 87e226aee..cdb1d01f2 100644
--- a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/DiameterServiceInterceptor.java
+++ b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/DiameterServiceInterceptor.java
@@ -24,28 +24,66 @@
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
 import org.jdiameter.api.*;
+import org.jdiameter.api.acc.ClientAccSession;
+import org.jdiameter.api.acc.ClientAccSessionListener;
+import org.jdiameter.api.acc.ServerAccSession;
+import org.jdiameter.api.acc.ServerAccSessionListener;
 import org.jdiameter.api.app.AppSession;
 import org.jdiameter.api.auth.ClientAuthSession;
+import org.jdiameter.api.auth.ClientAuthSessionListener;
 import org.jdiameter.api.auth.ServerAuthSession;
+import org.jdiameter.api.auth.ServerAuthSessionListener;
 import org.jdiameter.api.cca.ClientCCASession;
 import org.jdiameter.api.cca.ClientCCASessionListener;
 import org.jdiameter.api.cca.ServerCCASession;
 import org.jdiameter.api.cca.ServerCCASessionListener;
+import org.jdiameter.api.cxdx.ClientCxDxSession;
+import org.jdiameter.api.cxdx.ClientCxDxSessionListener;
+import org.jdiameter.api.cxdx.ServerCxDxSession;
+import org.jdiameter.api.cxdx.ServerCxDxSessionListener;
 import org.jdiameter.api.gq.ClientGqSessionListener;
 import org.jdiameter.api.gq.ServerGqSessionListener;
+import org.jdiameter.api.gx.ClientGxSession;
+import org.jdiameter.api.gx.ClientGxSessionListener;
+import org.jdiameter.api.gx.ServerGxSession;
+import org.jdiameter.api.gx.ServerGxSessionListener;
+import org.jdiameter.api.rf.ClientRfSession;
+import org.jdiameter.api.rf.ClientRfSessionListener;
+import org.jdiameter.api.rf.ServerRfSession;
+import org.jdiameter.api.rf.ServerRfSessionListener;
+import org.jdiameter.api.ro.ClientRoSession;
+import org.jdiameter.api.ro.ClientRoSessionListener;
+import org.jdiameter.api.ro.ServerRoSession;
+import org.jdiameter.api.ro.ServerRoSessionListener;
 import org.jdiameter.api.rx.ClientRxSession;
 import org.jdiameter.api.rx.ClientRxSessionListener;
 import org.jdiameter.api.rx.ServerRxSession;
 import org.jdiameter.api.rx.ServerRxSessionListener;
+import org.jdiameter.api.s13.ClientS13Session;
+import org.jdiameter.api.s13.ClientS13SessionListener;
+import org.jdiameter.api.s13.ServerS13Session;
+import org.jdiameter.api.s13.ServerS13SessionListener;
 import org.jdiameter.api.s6a.ClientS6aSession;
 import org.jdiameter.api.s6a.ClientS6aSessionListener;
 import org.jdiameter.api.s6a.ServerS6aSession;
 import org.jdiameter.api.s6a.ServerS6aSessionListener;
+import org.jdiameter.api.sh.ClientShSession;
+import org.jdiameter.api.sh.ClientShSessionListener;
+import org.jdiameter.api.sh.ServerShSession;
+import org.jdiameter.api.sh.ServerShSessionListener;
 import org.jdiameter.client.api.ISessionFactory;
+import org.jdiameter.common.impl.app.acc.AccSessionFactoryImpl;
+import org.jdiameter.common.impl.app.auth.AuthSessionFactoryImpl;
 import org.jdiameter.common.impl.app.cca.CCASessionFactoryImpl;
+import org.jdiameter.common.impl.app.cxdx.CxDxSessionFactoryImpl;
 import org.jdiameter.common.impl.app.gq.GqSessionFactoryImpl;
+import org.jdiameter.common.impl.app.gx.GxSessionFactoryImpl;
+import org.jdiameter.common.impl.app.rf.RfSessionFactoryImpl;
+import org.jdiameter.common.impl.app.ro.RoSessionFactoryImpl;
 import org.jdiameter.common.impl.app.rx.RxSessionFactoryImpl;
+import org.jdiameter.common.impl.app.s13.S13SessionFactoryImpl;
 import org.jdiameter.common.impl.app.s6a.S6aSessionFactoryImpl;
+import org.jdiameter.common.impl.app.sh.ShSessionFactoryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +114,23 @@ private void setupServerCAAFactory(Stack stack, ISessionFactory sessionFactory,
         setupDiameterServer(stack, sessionFactory, ServerCCASession.class, sessionListener, configProfile);
     }
 
+    private void setupClientGxFactory(ISessionFactory sessionFactory, String configProfile, ClientGxSessionListener sessionListener)
+    {
+        LOG.info("Staring Gx Diameter Client Service [{}].", configProfile);
+        GxSessionFactoryImpl sessionFactoryImpl = new GxSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientGxSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(sessionListener);
+    }
+
+    private void setupServerGxFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerGxSessionListener sessionListener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Gx Diameter Server Service [{}].", configProfile);
+        GxSessionFactoryImpl sessionFactoryImpl = new GxSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerGxSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(sessionListener);
+        setupDiameterServer(stack, sessionFactory, ServerGxSession.class, sessionListener, configProfile);
+    }
+
     private void clientSetupRxFactory(ISessionFactory sessionFactory, String configProfile, ClientRxSessionListener listener)
     {
         LOG.info("Staring Rx Diameter Client Service [{}].", configProfile);
@@ -128,6 +183,125 @@ private void serverSetupGqFactory(Stack stack, ISessionFactory sessionFactory, S
         setupDiameterServer(stack, sessionFactory, ServerAuthSession.class, listener, configProfile);
     }
 
+    private void clientSetupShFactory(ISessionFactory sessionFactory, String configProfile, ClientShSessionListener listener)
+    {
+        LOG.info("Staring Sh Diameter Client Service [{}].", configProfile);
+        ShSessionFactoryImpl sessionFactoryImpl = new ShSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientShSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientShSessionListener(listener);
+    }
+
+    private void serverSetupShFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerShSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Sh Diameter Server Service [{}].", configProfile);
+        ShSessionFactoryImpl sessionFactoryImpl = new ShSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerShSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerShSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerShSession.class, listener, configProfile);
+    }
+
+    private void clientSetupCxDxFactory(ISessionFactory sessionFactory, String configProfile, ClientCxDxSessionListener listener)
+    {
+        LOG.info("Staring CxDx Diameter Client Service [{}].", configProfile);
+        CxDxSessionFactoryImpl sessionFactoryImpl = new CxDxSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientCxDxSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupCxDxFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerCxDxSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring CxDx Diameter Server Service [{}].", configProfile);
+        CxDxSessionFactoryImpl sessionFactoryImpl = new CxDxSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerCxDxSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerShSession.class, listener, configProfile);
+    }
+
+    private void clientSetupS13Factory(ISessionFactory sessionFactory, String configProfile, ClientS13SessionListener listener)
+    {
+        LOG.info("Staring S13 Diameter Client Service [{}].", configProfile);
+        S13SessionFactoryImpl sessionFactoryImpl = new S13SessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientS13Session.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupS13Factory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerS13SessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring S13 Diameter Server Service [{}].", configProfile);
+        S13SessionFactoryImpl sessionFactoryImpl = new S13SessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerS13Session.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerS13Session.class, listener, configProfile);
+    }
+
+    private void clientSetupRoFactory(ISessionFactory sessionFactory, String configProfile, ClientRoSessionListener listener)
+    {
+        LOG.info("Staring Ro Diameter Client Service [{}].", configProfile);
+        RoSessionFactoryImpl sessionFactoryImpl = new RoSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientRoSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupRoFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerRoSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Ro Diameter Server Service [{}].", configProfile);
+        RoSessionFactoryImpl sessionFactoryImpl = new RoSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerRoSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerRoSession.class, listener, configProfile);
+    }
+
+    private void clientSetupRfFactory(ISessionFactory sessionFactory, String configProfile, ClientRfSessionListener listener)
+    {
+        LOG.info("Staring Rf Diameter Client Service [{}].", configProfile);
+        RfSessionFactoryImpl sessionFactoryImpl = new RfSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientRfSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupRfFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerRfSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Rf Diameter Server Service [{}].", configProfile);
+        RfSessionFactoryImpl sessionFactoryImpl = new RfSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerRfSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerRfSession.class, listener, configProfile);
+    }
+
+    private void clientSetupAuthFactory(ISessionFactory sessionFactory, String configProfile, ClientAuthSessionListener listener)
+    {
+        LOG.info("Staring Auth Diameter Client Service [{}].", configProfile);
+        AuthSessionFactoryImpl sessionFactoryImpl = new AuthSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientAuthSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupAuthFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerAuthSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Auth Diameter Server Service [{}].", configProfile);
+        AuthSessionFactoryImpl sessionFactoryImpl = new AuthSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerAuthSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerAuthSession.class, listener, configProfile);
+    }
+
+    private void clientSetupAccFactory(ISessionFactory sessionFactory, String configProfile, ClientAccSessionListener listener)
+    {
+        LOG.info("Staring Acc Diameter Client Service [{}].", configProfile);
+        AccSessionFactoryImpl sessionFactoryImpl = new AccSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ClientAccSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setClientSessionListener(listener);
+    }
+
+    private void serverSetupAccFactory(Stack stack, ISessionFactory sessionFactory, String configProfile, ServerAccSessionListener listener) throws ApplicationAlreadyUseException, InternalException
+    {
+        LOG.info("Staring Auth Diameter Server Service [{}].", configProfile);
+        AccSessionFactoryImpl sessionFactoryImpl = new AccSessionFactoryImpl(sessionFactory);
+        sessionFactory.registerAppFacory(ServerAccSession.class, sessionFactoryImpl);
+        sessionFactoryImpl.setServerSessionListener(listener);
+        setupDiameterServer(stack, sessionFactory, ServerAccSession.class, listener, configProfile);
+    }
+
     private NetworkReqListener createListener(ISessionFactory sessionFactory, Class<? extends AppSession> appSession)
     {
         return request -> {
@@ -191,6 +365,14 @@ public Object startStack(InvocationContext context) throws Exception
                     setupServerCAAFactory(stack, sessionFactory, configProfile, listener);
                 }
 
+                if (context.getTarget() instanceof ClientGxSessionListener listener) {
+                    setupClientGxFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerGxSessionListener listener) {
+                    setupServerGxFactory(stack, sessionFactory, configProfile, listener);
+                }
+
                 if (context.getTarget() instanceof ClientRxSessionListener listener) {
                     clientSetupRxFactory(sessionFactory, configProfile, listener);
                 }
@@ -215,6 +397,62 @@ public Object startStack(InvocationContext context) throws Exception
                     serverSetupGqFactory(stack, sessionFactory, configProfile, listener);
                 }
 
+                if (context.getTarget() instanceof ClientShSessionListener listener) {
+                    clientSetupShFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerShSessionListener listener) {
+                    serverSetupShFactory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientCxDxSessionListener listener) {
+                    clientSetupCxDxFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerCxDxSessionListener listener) {
+                    serverSetupCxDxFactory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientS13SessionListener listener) {
+                    clientSetupS13Factory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerS13SessionListener listener) {
+                    serverSetupS13Factory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientRoSessionListener listener) {
+                    clientSetupRoFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerRoSessionListener listener) {
+                    serverSetupRoFactory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientRfSessionListener listener) {
+                    clientSetupRfFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerRfSessionListener listener) {
+                    serverSetupRfFactory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientAuthSessionListener listener) {
+                    clientSetupAuthFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerAuthSessionListener listener) {
+                    serverSetupAuthFactory(stack, sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ClientAccSessionListener listener) {
+                    clientSetupAccFactory(sessionFactory, configProfile, listener);
+                }
+
+                if (context.getTarget() instanceof ServerAccSessionListener listener) {
+                    serverSetupAccFactory(stack, sessionFactory, configProfile, listener);
+                }
+
                 if (!stack.isActive()) {
                     LOG.debug("Starting the Diameter Stack [{}].", configProfile);
                     if (options != null && options.timeOut() > 0) {
diff --git a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/DiameterConfiguration.java b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/DiameterConfiguration.java
index 03f01a567..2dabe75f2 100644
--- a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/DiameterConfiguration.java
+++ b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/DiameterConfiguration.java
@@ -211,7 +211,7 @@ protected AppConfiguration createConcurrentItem(String name, int size)
     protected void addNetwork(Network network)
     {
         addPeers(network.peers().values());
-        addRealms(network.realms().values());
+        addRealms(network.realms());
     }
 
     protected void addPeers(Collection<Peer> peers)
@@ -245,10 +245,10 @@ protected AppConfiguration addPeer(Peer peer)
         return peerConfig;
     }
 
-    protected void addRealms(Collection<Realm> realms)
+    protected void addRealms(Map<String, Realm> realms)
     {
         ArrayList<Configuration> items = new ArrayList<>();
-        realms.forEach(realm -> items.add(addRealm(realm)));
+        realms.forEach((name, realm) -> items.add(addRealm(name, realm)));
         add(RealmTable, items.toArray(EMPTY_ARRAY));
     }
 
@@ -268,10 +268,10 @@ protected AppConfiguration addAgent(Map<String, String> properties)
         return agentConf;
     }
 
-    protected AppConfiguration buildRealm(Realm realm)
+    protected AppConfiguration buildRealm(String name, Realm realm)
     {
         AppConfiguration realmEntry = EmptyConfiguration.getInstance()
-                                                        .add(RealmName, realm.realmName())
+                                                        .add(RealmName, name)
                                                         .add(RealmHosts, realm.peers())
                                                         .add(RealmLocalAction, realm.localAction().name())
                                                         .add(RealmEntryIsDynamic, realm.dynamic())
@@ -287,9 +287,9 @@ protected AppConfiguration buildRealm(Realm realm)
         return realmEntry;
     }
 
-    protected Configuration addRealm(Realm realm)
+    protected Configuration addRealm(String name, Realm realm)
     {
-        return EmptyConfiguration.getInstance().add(RealmEntry, buildRealm(realm));
+        return EmptyConfiguration.getInstance().add(RealmEntry, buildRealm(name, realm));
     }
 
     protected void addInternalExtension(Ordinal ep, String value)
diff --git a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Network.java b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Network.java
index 10c711b45..9c3f088d7 100644
--- a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Network.java
+++ b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Network.java
@@ -2,9 +2,7 @@
 
 import io.quarkus.runtime.annotations.ConfigDocSection;
 import io.quarkus.runtime.annotations.ConfigGroup;
-import io.smallrye.config.WithDefaults;
 import io.smallrye.config.WithName;
-import io.smallrye.config.WithUnnamedKey;
 
 import java.util.Map;
 
@@ -15,21 +13,17 @@
 @ConfigGroup
 public interface Network
 {
-	/**
-	 * List of external peers and the way they connect.
-	 */
-	@WithName("peers")
-	@WithDefaults
-	@ConfigDocSection
-	@WithUnnamedKey
-	Map<String, Peer> peers();
+    /**
+     * List of external peers and the way they connect.
+     */
+    @WithName("peers")
+    @ConfigDocSection
+    Map<String, Peer> peers();
 
-	/**
-	 * List of all realms that connect into the Diameter network.
-	 */
-	@WithName("realms")
-	@WithDefaults
-	@ConfigDocSection
-	@WithUnnamedKey
-	Map<String, Realm> realms();
+    /**
+     * List of all realms that connect into the Diameter network.
+     */
+    @WithName("realms")
+    @ConfigDocSection
+    Map<String, Realm> realms();
 }
diff --git a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Realm.java b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Realm.java
index 2c3008618..8d6e141dc 100644
--- a/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Realm.java
+++ b/quarkus-diameter/runtime/src/main/java/io/quarkiverse/diameter/runtime/config/Realm.java
@@ -13,13 +13,6 @@
 @ConfigGroup
 public interface Realm
 {
-    /**
-     * Contains attributes and elements that describe different realms configured for the Core.
-     */
-    @WithName("realm-name")
-    @WithDefault("io.quarkiverse.diameter")
-    String realmName();
-
     /**
      * Comma separated list of peers. Each peer is represented by an IP Address or FQDN.
      */