diff --git a/hawkbit-autoconfigure/pom.xml b/hawkbit-autoconfigure/pom.xml
index f0c14eac3..06a52e6a4 100644
--- a/hawkbit-autoconfigure/pom.xml
+++ b/hawkbit-autoconfigure/pom.xml
@@ -27,12 +27,6 @@
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-dmf-amqp</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
             <artifactId>hawkbit-repository-jpa</artifactId>
diff --git a/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 9219c5312..deb0f089a 100644
--- a/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/hawkbit-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,6 +1,5 @@
 org.eclipse.hawkbit.autoconfigure.cache.CacheAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.ddi.DDiApiAutoConfiguration
-org.eclipse.hawkbit.autoconfigure.dmf.amqp.DmfApiAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.mgmt.MgmtApiAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.repository.event.EventPublisherAutoConfiguration
 org.eclipse.hawkbit.autoconfigure.repository.ArtifactFilesystemAutoConfiguration
diff --git a/hawkbit-starters/hawkbit-boot-starter-dmf-api/README.md b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/README.md
similarity index 100%
rename from hawkbit-starters/hawkbit-boot-starter-dmf-api/README.md
rename to hawkbit-dmf/hawkbit-boot-starter-dmf-api/README.md
diff --git a/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/pom.xml
similarity index 76%
rename from hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml
rename to hawkbit-dmf/hawkbit-boot-starter-dmf-api/pom.xml
index bc61937ce..a19c4d22c 100644
--- a/hawkbit-starters/hawkbit-boot-starter-dmf-api/pom.xml
+++ b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/pom.xml
@@ -14,13 +14,32 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-starters</artifactId>
+        <artifactId>hawkbit-dmf-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-boot-starter-dmf-api</artifactId>
     <name>hawkBit :: Spring Boot Starter DMF API</name>
 
     <dependencies>
+        <!-- hawkBit - START -->
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-repository-jpa</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-autoconfigure</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.hawkbit</groupId>
+            <artifactId>hawkbit-dmf-amqp</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- hawkBit - END -->
+
         <!-- Spring - START -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -36,23 +55,22 @@
         </dependency>
         <!-- Spring - END -->
 
-        <!-- hawkBit - START -->
         <dependency>
-            <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-dmf-amqp</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-repository-jpa</artifactId>
-            <version>${project.version}</version>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-autoconfigure</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
-        <!-- hawkBit - END -->
 
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java
similarity index 100%
rename from hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java
rename to hawkbit-dmf/hawkbit-boot-starter-dmf-api/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java
diff --git a/hawkbit-dmf/hawkbit-boot-starter-dmf-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..ed34ea308
--- /dev/null
+++ b/hawkbit-dmf/hawkbit-boot-starter-dmf-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.eclipse.hawkbit.autoconfigure.dmf.amqp.DmfApiAutoConfiguration
\ No newline at end of file
diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
index 1ef0fcedf..a123be309 100644
--- a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml
@@ -18,6 +18,7 @@
         <artifactId>hawkbit-dmf-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-dmf-amqp</artifactId>
     <name>hawkBit :: DMF :: AMQP 0.9 Implementation</name>
 
diff --git a/hawkbit-dmf/hawkbit-dmf-api/pom.xml b/hawkbit-dmf/hawkbit-dmf-api/pom.xml
index 2340e638c..841e3423e 100644
--- a/hawkbit-dmf/hawkbit-dmf-api/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-api/pom.xml
@@ -12,12 +12,12 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-dmf-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-dmf-api</artifactId>
     <name>hawkBit :: DMF :: API</name>
 
diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml
index 92367251c..4afad3b4c 100644
--- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/pom.xml
@@ -19,6 +19,7 @@
         <artifactId>hawkbit-dmf-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-dmf-rabbitmq-test</artifactId>
     <name>hawkBit :: DMF :: RabbitMq Test module</name>
 
diff --git a/hawkbit-runtime/hawkbit-dmf-server/README.md b/hawkbit-dmf/hawkbit-dmf-server/README.md
similarity index 93%
rename from hawkbit-runtime/hawkbit-dmf-server/README.md
rename to hawkbit-dmf/hawkbit-dmf-server/README.md
index 297c4d324..4a46e0855 100644
--- a/hawkbit-runtime/hawkbit-dmf-server/README.md
+++ b/hawkbit-dmf/hawkbit-dmf-server/README.md
@@ -1,48 +1,40 @@
-# hawkBit DMF Server (EXPERIMENTAL!)
-
+# hawkBit DMF Server
 The hawkBit DMF Server is a standalone spring-boot application with an embedded servlet container. It should be started
 with at least hawkbit-mgmt-server.
 
 ## On your own workstation
 
 ### Run
-
 ```bash
 java -jar hawkbit-runtime/hawkbit-dmf-server/target/hawkbit-dmf-server-*-SNAPSHOT.jar
 ```
-
 _(Note: you have to add the JDBC driver also to your class path if you intend to use another database than H2.)_
 
 Or:
-
 ```bash
 run org.eclipse.hawkbit.app.dmf.DMFStart
 ```
 
-### Clustering (Experimental!!!)
-
+### Clustering (Experimental)
 The micro-service instances are configured to communicate via Spring Cloud Bus. You could run multiple instances of any
 micro-service but hawkbit-mgmt-server. Management server run some schedulers which shall not run simultaneously - e.g.
 auto assignment checker and rollouts executor. To run multiple management server instances you shall do some extensions
 of hawkbit to ensure that they wont run schedulers simultaneously or you shall configure all instances but one to do not
 run schedulers!
 
-## Optional Protostuff for Sprign cloud bus
-
+## Optional Protostuff for Spring cloud bus
 The micro-service instances are configured to communicate via Spring Cloud Bus. Optionally, you could
 use [Protostuff](https://github.com/protostuff/protostuff) based message payload serialization for improved performance.
 
 **Note**: If Protostuff is enabled it shall be enabled on all microservices!
 
 Add/Uncomment to/in your `application.properties` :
-
 ```properties
 spring.cloud.stream.bindings.springCloudBusInput.content-type=application/binary+protostuff
 spring.cloud.stream.bindings.springCloudBusOutput.content-type=application/binary+protostuff
 ```
 
 Add to your `pom.xml` :
-
 ```xml
 <dependency>
   <groupId>io.protostuff</groupId>
diff --git a/hawkbit-runtime/hawkbit-dmf-server/pom.xml b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
similarity index 57%
rename from hawkbit-runtime/hawkbit-dmf-server/pom.xml
rename to hawkbit-dmf/hawkbit-dmf-server/pom.xml
index 45f31c7bd..10121b354 100644
--- a/hawkbit-runtime/hawkbit-dmf-server/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-runtime-parent</artifactId>
+        <artifactId>hawkbit-dmf-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-dmf-server</artifactId>
     <name>hawkBit :: Runtime :: DMF Server</name>
 
@@ -36,4 +37,31 @@
             <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
         </dependency>
     </dependencies>
-</project>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${baseDir}</outputDirectory>
+                            <mainClass>${spring.app.class}</mainClass>
+                            <layout>JAR</layout>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>
\ No newline at end of file
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/java/org/eclipse/hawkbit/app/dmf/DMFStart.java b/hawkbit-dmf/hawkbit-dmf-server/src/main/java/org/eclipse/hawkbit/app/dmf/DMFStart.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/java/org/eclipse/hawkbit/app/dmf/DMFStart.java
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/java/org/eclipse/hawkbit/app/dmf/DMFStart.java
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-db2.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-db2.properties
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-db2.properties
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-mssql.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-mssql.properties
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mssql.properties
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-mysql.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mysql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-mysql.properties
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-mysql.properties
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-postgresql.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-postgresql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application-postgresql.properties
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application-postgresql.properties
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/application.properties
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties
diff --git a/hawkbit-runtime/hawkbit-dmf-server/src/main/resources/banner.txt b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt
similarity index 100%
rename from hawkbit-runtime/hawkbit-dmf-server/src/main/resources/banner.txt
rename to hawkbit-dmf/hawkbit-dmf-server/src/main/resources/banner.txt
diff --git a/hawkbit-dmf/pom.xml b/hawkbit-dmf/pom.xml
index 325728619..081d03b3c 100644
--- a/hawkbit-dmf/pom.xml
+++ b/hawkbit-dmf/pom.xml
@@ -24,6 +24,9 @@
     <modules>
         <module>hawkbit-dmf-api</module>
         <module>hawkbit-dmf-amqp</module>
+        <module>hawkbit-boot-starter-dmf-api</module>
+        <module>hawkbit-dmf-server</module>
+
         <module>hawkbit-dmf-rabbitmq-test</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml
index 14cae7032..2e4238166 100644
--- a/hawkbit-runtime/pom.xml
+++ b/hawkbit-runtime/pom.xml
@@ -86,7 +86,6 @@
 
     <modules>
         <module>hawkbit-ddi-server</module>
-        <module>hawkbit-dmf-server</module>
         <module>hawkbit-mgmt-server</module>
         <module>hawkbit-simple-ui</module>
 
diff --git a/hawkbit-starters/pom.xml b/hawkbit-starters/pom.xml
index e7decc60b..79706886f 100644
--- a/hawkbit-starters/pom.xml
+++ b/hawkbit-starters/pom.xml
@@ -24,6 +24,5 @@
         <module>hawkbit-boot-starter</module>
         <module>hawkbit-boot-starter-mgmt-api</module>
         <module>hawkbit-boot-starter-ddi-api</module>
-        <module>hawkbit-boot-starter-dmf-api</module>
     </modules>
 </project>
\ No newline at end of file