diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
index 5e767726a..8f7ab288a 100644
--- a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
+++ b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
@@ -38,6 +38,6 @@ hawkbit.controller.pollingTime=00:05:00
 hawkbit.controller.pollingOverdueTime=00:05:00
 
 ## Configuration for RabbitMQ integration
-hawkbit.dmf.rabbitmq.deadLetterQueue=dmf_connector_deadletter
-hawkbit.dmf.rabbitmq.deadLetterExchange=dmf.connector.deadletter
+hawkbit.dmf.rabbitmq.deadLetterQueue=dmf_receiver_deadletter
+hawkbit.dmf.rabbitmq.deadLetterExchange=dmf.receiver.deadletter
 hawkbit.dmf.rabbitmq.receiverQueue=dmf_receiver
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java
index 5a9c18f05..4b33a59b8 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java
@@ -23,12 +23,12 @@ public class AmqpProperties {
     /**
      * DMF API dead letter queue.
      */
-    private String deadLetterQueue = "dmf_connector_deadletter";
+    private String deadLetterQueue = "dmf_receiver_deadletter";
 
     /**
      * DMF API dead letter exchange.
      */
-    private String deadLetterExchange = "dmf.connector.deadletter";
+    private String deadLetterExchange = "dmf.receiver.deadletter";
 
     /**
      * DMF API receiving queue.
@@ -36,8 +36,7 @@ public class AmqpProperties {
     private String receiverQueue = "dmf_receiver";
 
     /**
-     * Missing queue fatal, see
-     * {@link SimpleMessageListenerContainer#setMissingQueuesFatal(boolean)}.
+     * Missing queue fatal.
      */
     private boolean missingQueuesFatal = false;