diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e8ae77bdf..69cc70ae1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,15 +113,22 @@ jobs:
           wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -P /tmp
           tar xf /tmp/apache-maven-3.6.3-bin.tar.gz -C /opt
           echo "${M2_HOME}/bin" >> $GITHUB_PATH
+
+      # To ensure docker containers are fully up and running we sleep 60s
+      - name: Before script
+        run: |
+          source src/main/docker/env.bash
+          docker compose -f src/main/docker/docker-compose.yml up -d mongodb mongodb-auth rabbitmq eiffel-er mail-server
+          sleep 60
           
-      - name: Run cobertura
+      - name: Run jacoco
         shell: bash
         run: |
-          mvn cobertura:cobertura -Dcobertura.report.format=xml -B
+          mvn -V -B -U clean test -DskipITs -Dsurefire.rerunFailingTestsCount=2 -Djasypt.encryptor.password=secret -Dspring.config.location=src/functionaltests/resources/application.properties jacoco:report -Dformats=xml
           
       # Generating test coverage report and publishing to Codacy
       - name: Run report coverage
         uses: codacy/codacy-coverage-reporter-action@v1
         with:
           project-token: 571cdd20d4bf435f84b25d806d304792
-          coverage-reports: target/site/cobertura/coverage.xml
+          coverage-reports: target/site/jacoco/jacoco.xml
diff --git a/pom.xml b/pom.xml
index d6d73cf91..42161efaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,26 +664,44 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.8</version>
-                <configuration>
-                    <excludes>
-                        <exclude>com/ericsson/ei/controller/model/*</exclude>
-                    </excludes>
-                </configuration>
                 <executions>
                     <execution>
-                        <id>jacoco-initialize</id>
+                        <id>prepare-agent</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>jacoco-site</id>
-                        <phase>package</phase>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains 
+                                the execution data. -->
+                            <dataFile>target/jacoco.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage 
+                                report. -->
+                            <outputDirectory>target/jacoco</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>com/ericsson/ei/controller/model/*</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+                    </systemPropertyVariables>
+	        </configuration>
             </plugin>
         </plugins>
     </build>