diff --git a/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf-amqp/pom.xml
index 289d97663..9dd4f12aa 100644
--- a/hawkbit-dmf-amqp/pom.xml
+++ b/hawkbit-dmf-amqp/pom.xml
@@ -48,12 +48,7 @@
       <dependency>
          <groupId>org.springframework.amqp</groupId>
          <artifactId>spring-rabbit</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>com.rabbitmq</groupId>
-         <artifactId>amqp-client</artifactId>
-         <version>3.6.2</version>
-      </dependency>
+      </dependency>     
       <dependency>
          <groupId>org.springframework.security</groupId>
          <artifactId>spring-security-web</artifactId>
diff --git a/pom.xml b/pom.xml
index f50afa0ab..8e49bd9df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
       <hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
       <spring-cloud-connectors.version>1.2.0.RELEASE</spring-cloud-connectors.version>
       <spring-amqp.version>1.6.0.RELEASE</spring-amqp.version>
+      <rabbitmq.version>3.6.2</rabbitmq.version>
       <spring-hateoas.version>0.18.0.RELEASE</spring-hateoas.version>
       <!--  Support for MongoDB 3 -->
       <spring-data-releasetrain.version>Fowler-SR1</spring-data-releasetrain.version>
@@ -526,6 +527,11 @@
             <artifactId>org.eclipse.persistence.jpa</artifactId>
             <version>${eclipselink.version}</version>
          </dependency>
+         <dependency>
+            <groupId>com.rabbitmq</groupId>
+            <artifactId>amqp-client</artifactId>
+            <version>${rabbitmq.version}</version>
+         </dependency>
          <!-- RSQL / FIQL parser -->
          <dependency>
             <groupId>cz.jirutka.rsql</groupId>