diff --git a/assembly/broker-artemis/configurations/broker.xml b/assembly/broker-artemis/configurations/broker.xml
index 5d639ad9ffc..a98834d64c8 100644
--- a/assembly/broker-artemis/configurations/broker.xml
+++ b/assembly/broker-artemis/configurations/broker.xml
@@ -117,8 +117,8 @@
         <address-settings>
             <!-- if you define auto-create on certain queues, management has to be auto-create -->
             <address-setting match="activemq.management#">
-                <dead-letter-address>dlq</dead-letter-address>
-                <expiry-address>expired</expiry-address>
+                <dead-letter-address>$SYS/dlq</dead-letter-address>
+                <expiry-address>$SYS/expired</expiry-address>
                 <redelivery-delay>0</redelivery-delay>
                 <!-- with -1 only the global-max-size is in use for limiting -->
                 <max-size-bytes>-1</max-size-bytes>
@@ -132,8 +132,8 @@
             </address-setting>
             <!--default for catch all-->
             <address-setting match="#">
-                <dead-letter-address>dlq</dead-letter-address>
-                <expiry-address>expired</expiry-address>
+                <dead-letter-address>$SYS/dlq</dead-letter-address>
+                <expiry-address>$SYS/expired</expiry-address>
                 <redelivery-delay>0</redelivery-delay>
                 <!-- with -1 only the global-max-size is in use for limiting -->
                 <max-size-bytes>-1</max-size-bytes>
@@ -166,19 +166,14 @@
             </broker-plugin>
         </broker-plugins>
         <addresses>
-            <address name="dlq">
+            <address name="$SYS/dlq">
                 <anycast>
-                    <queue name="dlq"/>
+                    <queue name="$SYS/dlq"/>
                 </anycast>
             </address>
-            <address name="authDlq">
+            <address name="$SYS/expired">
                 <anycast>
-                    <queue name="authDlq"/>
-                </anycast>
-            </address>
-            <address name="expired">
-                <anycast>
-                    <queue name="expired"/>
+                    <queue name="$SYS/expired"/>
                 </anycast>
             </address>
         </addresses>
diff --git a/assembly/events-broker/configurations/broker.xml b/assembly/events-broker/configurations/broker.xml
index 00aea8d4f0a..ee4e6566ec6 100644
--- a/assembly/events-broker/configurations/broker.xml
+++ b/assembly/events-broker/configurations/broker.xml
@@ -111,25 +111,10 @@
         </security-settings>
 
         <address-settings>
-            <!-- if you define auto-create on certain queues, management has to be auto-create -->
-            <address-setting match="activemq.management#">
-                <dead-letter-address>DLQ</dead-letter-address>
-                <expiry-address>ExpiryQueue</expiry-address>
-                <redelivery-delay>0</redelivery-delay>
-                <!-- with -1 only the global-max-size is in use for limiting -->
-                <max-size-bytes>-1</max-size-bytes>
-                <message-counter-history-day-limit>10</message-counter-history-day-limit>
-                <address-full-policy>PAGE</address-full-policy>
-                <auto-create-queues>true</auto-create-queues>
-                <auto-create-addresses>true</auto-create-addresses>
-                <auto-create-jms-queues>true</auto-create-jms-queues>
-                <auto-create-jms-topics>true</auto-create-jms-topics>
-                <default-address-routing-type>ANYCAST</default-address-routing-type>
-            </address-setting>
             <!--default for catch all-->
             <address-setting match="#">
-                <dead-letter-address>DLQ</dead-letter-address>
-                <expiry-address>ExpiryQueue</expiry-address>
+                <dead-letter-address>dlq</dead-letter-address>
+                <expiry-address>expired</expiry-address>
                 <redelivery-delay>0</redelivery-delay>
                 <!-- with -1 only the global-max-size is in use for limiting -->
                 <max-size-bytes>-1</max-size-bytes>
@@ -144,14 +129,14 @@
         </address-settings>
 
         <addresses>
-            <address name="DLQ">
+            <address name="dlq">
                 <anycast>
-                    <queue name="DLQ"/>
+                    <queue name="dlq"/>
                 </anycast>
             </address>
-            <address name="ExpiryQueue">
+            <address name="expired">
                 <anycast>
-                    <queue name="ExpiryQueue"/>
+                    <queue name="expired"/>
                 </anycast>
             </address>
         </addresses>
diff --git a/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java b/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
index 27f8fcf2116..f73f78a126e 100644
--- a/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
+++ b/broker/artemis/plugin/src/main/java/org/eclipse/kapua/broker/artemis/plugin/security/ServerPlugin.java
@@ -76,9 +76,10 @@ enum Failure {
 
     public static enum MessageType {
 
-        ActiveMq("AMQ"),
+        Broker("BRK"),
         Control("CTR"),
-        Telemetry("TEL");
+        Telemetry("TEL"),
+        System("SYS");
 
         private String asUrl;
 
@@ -245,10 +246,15 @@ private boolean isLwt(String originalTopic) {
     private String getMessgeType(String address) {
         if (address!=null) {
             if (address.startsWith("active")) {
-                return MessageType.ActiveMq.getAsUrl();
+                return MessageType.Broker.getAsUrl();
             }
             else if (address.startsWith("$")) {
-                return MessageType.Control.getAsUrl();
+                if (address.startsWith("$SYS")) {
+                    return MessageType.System.getAsUrl();
+                }
+                else {
+                    return MessageType.Control.getAsUrl();
+                }
             }
             else {
                 return MessageType.Telemetry.getAsUrl();
diff --git a/consumer/lifecycle-app/src/main/resources/camel/camel.xml b/consumer/lifecycle-app/src/main/resources/camel/camel.xml
index e4304b9f753..6a7f12d1853 100644
--- a/consumer/lifecycle-app/src/main/resources/camel/camel.xml
+++ b/consumer/lifecycle-app/src/main/resources/camel/camel.xml
@@ -53,7 +53,7 @@
         </pipeline>
     </route>
     <route id="dlq">
-        <from uri="amqp:queue:dlq?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
+        <from uri="amqp:queue:$SYS/dlq?selector=KAPUA_MESSAGE_TYPE='SYS'&amp;asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
         <pipeline>
             <bean ref="kapuaCamelFilter" method="bindSession"/>
             <to uri="bean:errorMessageListener?method=processMessage"/>
diff --git a/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml b/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml
index 4a31667fcd6..42e080d4182 100644
--- a/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml
+++ b/consumer/lifecycle-app/src/main/resources/spring/applicationContext.xml
@@ -75,7 +75,7 @@
         <!-- exception/error handler -->
         <camel:errorHandler id="mainRouteMessageErrorHandler" redeliveryPolicyRef="kapuaRedeliveryPolicy"
             type="DeadLetterChannel"
-            deadLetterUri="amqp:queue:dlq"
+            deadLetterUri="amqp:queue:$SYS/dlq"
             useOriginalMessage="true">
         </camel:errorHandler>
         <camel:redeliveryPolicyProfile id="kapuaRedeliveryPolicy" maximumRedeliveries="0" redeliveryDelay="0" retryAttemptedLogLevel="WARN" logRetryAttempted="true"/>
diff --git a/consumer/telemetry-app/src/main/resources/camel/camel.xml b/consumer/telemetry-app/src/main/resources/camel/camel.xml
index c3203adf28e..874bdafac43 100644
--- a/consumer/telemetry-app/src/main/resources/camel/camel.xml
+++ b/consumer/telemetry-app/src/main/resources/camel/camel.xml
@@ -25,7 +25,7 @@
         </pipeline>
     </route>
     <route id="dlq">
-        <from uri="amqp:queue:dlq?asyncConsumer=true&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
+        <from uri="amqp:queue:$SYS/dlq?selector=KAPUA_MESSAGE_TYPE='SYS'&amp;asyncConsumer=true&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
         <pipeline>
             <bean ref="kapuaCamelFilter" method="bindSession"/>
             <to uri="bean:errorMessageListener?method=processMessage"/>
diff --git a/service/authentication-app/src/main/resources/camel/camel.xml b/service/authentication-app/src/main/resources/camel/camel.xml
index 7616793e2ad..801f70ee8f4 100644
--- a/service/authentication-app/src/main/resources/camel/camel.xml
+++ b/service/authentication-app/src/main/resources/camel/camel.xml
@@ -13,7 +13,7 @@
  -->
 <routes xmlns="http://camel.apache.org/schema/spring">
     <route errorHandlerRef="authRouteMessageErrorHandler" id="authRoute">
-        <from uri="amqp:queue://auth_request?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
+        <from uri="amqp:queue:auth_request?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=2&amp;maxConcurrentConsumers=5"/>
         <pipeline>
             <choice id="main">
                 <when id="doLogin">
@@ -36,7 +36,13 @@
         </pipeline>
     </route>
     <route id="authDlq">
-        <from uri="amqp:queue:authDlq?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=1&amp;maxConcurrentConsumers=2"/>
+        <from uri="amqp:queue:dlq?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=1&amp;maxConcurrentConsumers=2"/>
+        <pipeline>
+            <to uri="bean:errorMessageListener?method=processMessage"/>
+        </pipeline>
+    </route>
+    <route id="expired">
+        <from uri="amqp:queue:expired?asyncConsumer=false&amp;acknowledgementModeName=CLIENT_ACKNOWLEDGE&amp;transacted=false&amp;concurrentConsumers=1&amp;maxConcurrentConsumers=2"/>
         <pipeline>
             <to uri="bean:errorMessageListener?method=processMessage"/>
         </pipeline>
diff --git a/service/camel/src/main/java/org/eclipse/kapua/service/camel/listener/error/FailureProcessor.java b/service/camel/src/main/java/org/eclipse/kapua/service/camel/listener/error/FailureProcessor.java
index ecb79e8b03d..43bd97308e4 100644
--- a/service/camel/src/main/java/org/eclipse/kapua/service/camel/listener/error/FailureProcessor.java
+++ b/service/camel/src/main/java/org/eclipse/kapua/service/camel/listener/error/FailureProcessor.java
@@ -16,7 +16,6 @@
 import org.apache.camel.Processor;
 import org.eclipse.kapua.KapuaUnauthenticatedException;
 import org.eclipse.kapua.service.camel.application.MetricsCamel;
-import org.eclipse.kapua.service.client.message.MessageConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,21 +28,6 @@ public class FailureProcessor implements Processor {
 
     private static final Logger logger = LoggerFactory.getLogger(FailureProcessor.class);
 
-    public static enum MessageProcessResult {
-
-        Error("ERR");
-
-        private String asUrl;
-
-        MessageProcessResult(String asUrl) {
-            this.asUrl = asUrl;
-        }
-
-        public String getAsUrl() {
-            return asUrl;
-        }
-    }
-
     //TODO inject!!!
     private MetricsCamel metrics;
 
@@ -53,7 +37,6 @@ public FailureProcessor() {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        exchange.getIn().setHeader(MessageConstants.HEADER_KAPUA_PROCESS_RESULT, MessageProcessResult.Error.getAsUrl());
         if (isUnauthenticatedException(exchange)) {
             if (logger.isDebugEnabled()) {
                 logger.debug("Detected unauthenticated error on message processing retry!");
diff --git a/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java b/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
index 3ae382beab8..59d7d79a3e6 100644
--- a/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
+++ b/service/client/src/main/java/org/eclipse/kapua/service/client/message/MessageConstants.java
@@ -36,7 +36,6 @@ private MessageConstants() {
     public static final String HEADER_KAPUA_BROKER_CONTEXT = "KAPUA_BROKER_CONTEXT";
     public static final String HEADER_KAPUA_PROCESSING_EXCEPTION = "KAPUA_PROCESSING_EXCEPTION";
     public static final String HEADER_KAPUA_MESSAGE_TYPE = "KAPUA_MESSAGE_TYPE";
-    public static final String HEADER_KAPUA_PROCESS_RESULT = "KAPUA_PROCESS_RESULT";
 
     public static final String HEADER_CAMEL_JMS_HEADER_TIMESTAMP = "JMSTimestamp";
     public static final String HEADER_CAMEL_JMS_HEADER_DESTINATION = "JMSDestination";