diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4733474a11f244ddd965cad946b24561c4e42ece..c6316cee4ab091dc1b58de4e54ef8f9c73145f89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ test-backend-table:
     - "./fda-table-service/rest-service/src/test/resources/integration-test.before"
     - "mvn -f fda-table-service/pom.xml clean test verify"
     - "./fda-table-service/rest-service/src/test/resources/integration-test.after"
-#    - cat fda-table-service/rest-service/target/site/jacoco/index.html
+    - cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html
   needs:
     - build-metadata-db
   dependencies:
diff --git a/fda-container-service/pom.xml b/fda-container-service/pom.xml
index d7f0dbb16337d96027d7a6d89b4c98702e783634..d32faa083069098aed8ca10df5c64ca9c913a622 100644
--- a/fda-container-service/pom.xml
+++ b/fda-container-service/pom.xml
@@ -166,7 +166,7 @@
                         <exclude>at/tuwien/mapper/**/*</exclude>
                         <exclude>at/tuwien/exception/**/*</exclude>
                         <exclude>at/tuwien/config/**/*</exclude>
-                        <exclude>**/FdaQueryServiceApplication.class</exclude>
+                        <exclude>**/FdaContainerManagingApplication.class</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/fda-database-service/report/pom.xml b/fda-database-service/report/pom.xml
index b91bd1b00b7700e9efbad8cc479ddfe70564ce55..082f21829d5d97de495231377e8a761ff239825c 100644
--- a/fda-database-service/report/pom.xml
+++ b/fda-database-service/report/pom.xml
@@ -4,8 +4,8 @@
          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>at.tuwien</groupId>
         <artifactId>fda-database-service</artifactId>
+        <groupId>at.tuwien</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 5ad7dd9862684f95d60f14f5e1e68d101b31258c..7fded984a464599ab047337010a62752c70f9387 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -11,9 +11,10 @@ RUN mvn -fn -B dependency:go-offline > /dev/null
 
 COPY --from=dependency /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
 
-COPY ./gateways ./gateways
+COPY ./gateway ./gateway
 COPY ./rest-service ./rest-service
 COPY ./services ./services
+COPY ./report ./report
 
 RUN mvn -q clean package -DskipTests
 
diff --git a/fda-table-service/gateways/pom.xml b/fda-table-service/gateway/pom.xml
similarity index 95%
rename from fda-table-service/gateways/pom.xml
rename to fda-table-service/gateway/pom.xml
index d88a4e3ecc939670770ff07e4d8315e1f6d0a822..48c907017feca691b97ad8746acce3db8db35e47 100644
--- a/fda-table-service/gateways/pom.xml
+++ b/fda-table-service/gateway/pom.xml
@@ -9,7 +9,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>gateways</artifactId>
+    <artifactId>gateway</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>fda-table-service-gateways</name>
 
diff --git a/fda-table-service/gateways/src/main/java/at/tuwien/config/.gitkeep b/fda-table-service/gateway/src/main/java/at/tuwien/config/.gitkeep
similarity index 100%
rename from fda-table-service/gateways/src/main/java/at/tuwien/config/.gitkeep
rename to fda-table-service/gateway/src/main/java/at/tuwien/config/.gitkeep
diff --git a/fda-table-service/pom.xml b/fda-table-service/pom.xml
index 18250d15a4853c6e8fe934f51fc3f2ac8f9ce220..25d843b452014e1c7f6319faa8541a5dd3f318ff 100644
--- a/fda-table-service/pom.xml
+++ b/fda-table-service/pom.xml
@@ -18,7 +18,8 @@
     <modules>
         <module>rest-service</module>
         <module>services</module>
-        <module>gateways</module>
+        <module>gateway</module>
+        <module>report</module>
     </modules>
 
     <properties>
@@ -169,6 +170,37 @@
         </dependency>
     </dependencies>
 
-    <!-- build in ./rest-service/pom.xml -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <configuration>
+                    <excludes>
+                        <exclude>at/tuwien/mapper/**/*</exclude>
+                        <exclude>at/tuwien/exception/**/*</exclude>
+                        <exclude>at/tuwien/utils/**/*</exclude>
+                        <exclude>**/FdaTableServiceApplication.class</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>default-report</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/fda-table-service/report/pom.xml b/fda-table-service/report/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93155d0f6e9267064b271242a2ee72cd7cd7e776
--- /dev/null
+++ b/fda-table-service/report/pom.xml
@@ -0,0 +1,57 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>fda-table-service</artifactId>
+        <groupId>at.tuwien</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>report</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>fda-database-service-report</name>
+
+    <properties>
+        <jacoco.version>0.8.7</jacoco.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>gateway</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>rest-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>services</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco.version}</version>
+                <executions>
+                    <execution>
+                        <id>report-aggregate</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/fda-table-service/rest-service/pom.xml b/fda-table-service/rest-service/pom.xml
index 3a65be151b41491806bbaeadbb7a5cafec0b3b1f..2251386c21fca68e9fc8624042368cf49377db32 100644
--- a/fda-table-service/rest-service/pom.xml
+++ b/fda-table-service/rest-service/pom.xml
@@ -34,31 +34,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/FdaTableServiceApplication.class</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>default-prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-report</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>