diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..0b0b3b5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM maven:3.6.3-openjdk-8-slim AS build
+COPY demo-command/src /usr/src/demo-cqrs/demo-command/src
+COPY demo-command/pom.xml /usr/src/demo-cqrs/demo-command
+COPY demo-query/src /usr/src/demo-cqrs/demo-query/src
+COPY demo-query/pom.xml /usr/src/demo-cqrs/demo-query
+COPY pom.xml /usr/src/demo-cqrs
+RUN mvn -f /usr/src/demo-cqrs/pom.xml clean package
+
+FROM openjdk:8-alpine AS demo-command
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+COPY --from=build /usr/src/demo-cqrs/demo-command/target/demo-command-0.0.1-SNAPSHOT.jar /usr/app/demo-command-0.0.1-SNAPSHOT.jar
+EXPOSE 8081
+ENTRYPOINT ["java","-jar","/usr/app/demo-command-0.0.1-SNAPSHOT.jar"]
+
+FROM openjdk:8-alpine AS demo-query
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+COPY --from=build /usr/src/demo-cqrs/demo-query/target/demo-query-0.0.1-SNAPSHOT.jar /usr/app/demo-query-0.0.1-SNAPSHOT.jar
+EXPOSE 8082
+ENTRYPOINT ["java","-jar","/usr/app/demo-query-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/demo-command/Dockerfile b/demo-command/Dockerfile
deleted file mode 100644
index c02aff6..0000000
--- a/demo-command/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM maven:3.6.3-openjdk-8-slim AS build
-COPY src /usr/src/app/src
-COPY pom.xml /usr/src/app
-RUN mvn -f /usr/src/app/pom.xml clean package
-
-FROM openjdk:8-alpine
-RUN addgroup -S spring && adduser -S spring -G spring
-USER spring:spring
-COPY --from=build /usr/src/app/target/demo-0.0.1-SNAPSHOT.jar /usr/app/demo-0.0.1-SNAPSHOT.jar
-EXPOSE 8081
-ENTRYPOINT ["java","-jar","/usr/app/demo-0.0.1-SNAPSHOT.jar"]
diff --git a/demo-command/pom.xml b/demo-command/pom.xml
index 1c0f6f1..0096d05 100644
--- a/demo-command/pom.xml
+++ b/demo-command/pom.xml
@@ -1,70 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<groupId>es.dbiosag</groupId>
+		<artifactId>demo-cqrs</artifactId>
+		<version>0.0.1</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<groupId>es.dbiosag</groupId>
-	<artifactId>demo</artifactId>
+
+	<artifactId>demo-command</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>demo CQRS with Kafka</name>
-	<description>Demo project for Spring Boot</description>
-
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-        </plugins>
-	</build>
+	<name>demo-command CQRS with Kafka</name>
+	<description>Demo command project for Spring Boot</description>
 
 </project>
diff --git a/demo-query/Dockerfile b/demo-query/Dockerfile
deleted file mode 100644
index a9f7dcc..0000000
--- a/demo-query/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM maven:3.6.3-openjdk-8-slim AS build
-COPY src /usr/src/app/src
-COPY pom.xml /usr/src/app
-RUN mvn -f /usr/src/app/pom.xml clean package
-
-FROM openjdk:8-alpine
-RUN addgroup -S spring && adduser -S spring -G spring
-USER spring:spring
-COPY --from=build /usr/src/app/target/demo-0.0.1-SNAPSHOT.jar /usr/app/demo-0.0.1-SNAPSHOT.jar
-EXPOSE 8082
-ENTRYPOINT ["java","-jar","/usr/app/demo-0.0.1-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/demo-query/pom.xml b/demo-query/pom.xml
index cfaf9e4..975124c 100644
--- a/demo-query/pom.xml
+++ b/demo-query/pom.xml
@@ -1,62 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-	<groupId>es.dbiosag</groupId>
-	<artifactId>demo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>demo CQRS with Kafka</name>
-	<description>Demo project for Spring Boot</description>
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<properties>
-		<java.version>1.8</java.version>
-	</properties>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>es.dbiosag</groupId>
+		<artifactId>demo-cqrs</artifactId>
+		<version>0.0.1</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>demo-query</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>demo-command CQRS with Kafka</name>
+	<description>Demo query project for Spring Boot</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.kafka</groupId>
-			<artifactId>spring-kafka-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -66,13 +27,4 @@
 
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-        </plugins>
-	</build>
-
 </project>
diff --git a/docker-compose.yml b/docker-compose.yml
index 1793f68..b939436 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
 
   demo-command:
     build:
-      context: demo-command
+      context: .
       dockerfile: Dockerfile
     image: demo-command
     hostname: demo-command
@@ -59,7 +59,7 @@ services:
 
   demo-query-1:
     build:
-      context: demo-query
+      context: .
       dockerfile: Dockerfile
     image: demo-query
     hostname: demo-query-1
@@ -71,19 +71,19 @@ services:
     networks:
       - kafka_net
 
-  demo-query-2:
-    build:
-      context: demo-query
-      dockerfile: Dockerfile
-    image: demo-query
-    hostname: demo-query-2
-    ports:
-      - "8083:8082"
-    depends_on:
-      kafka1:
-        condition: service_healthy
-    networks:
-      - kafka_net
+#  demo-query-2:
+#    build:
+#      context: demo-query
+#      dockerfile: Dockerfile
+#    image: demo-query
+#    hostname: demo-query-2
+#    ports:
+#      - "8083:8082"
+#    depends_on:
+#      kafka1:
+#        condition: service_healthy
+#    networks:
+#      - kafka_net
 
 networks:
   kafka_net:
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7b581d1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.0</version>
+        <relativePath></relativePath>
+    </parent>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.version>0.0.1</project.version>
+        <project.groupId>es.dbiosag</project.groupId>
+    </properties>
+
+    <groupId>es.dbiosag</groupId>
+    <artifactId>demo-cqrs</artifactId>
+    <name>demo CQRS with Kafka</name>
+    <description>Demo project for Spring Boot</description>
+    <packaging>pom</packaging>
+    <version>0.0.1</version>
+
+    <modules>
+        <module>demo-query</module>
+        <module>demo-command</module>
+    </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>