diff --git a/pom.xml b/pom.xml
index 9038d2e56..d78d6d2cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,30 +127,11 @@
       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
       <sonar.links.homepage>https://projects.eclipse.org/projects/iot.hawkbit</sonar.links.homepage>
       <sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
-      <!-- Jacoco version to use -->
       <jacoco.version>0.7.7.201606060606</jacoco.version>
-      <!-- The Sonar Jacoco Listener for JUnit to extract coverage details
-         per test -->
-      <sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version>
-      <!-- Don't let Sonar execute tests. We will ask it to Maven -->
-      <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-      <!-- The system property jacoco.outputDir needs to be override on the
-         command line with an absolute path if you want to merge results from all
-         modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your
-         project in the root directory of the workspace : mvn clean install -Prun-its,coverage
-         -Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
-         following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
-         <jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
       <jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
-      <!-- Jacoco output file for UTs -->
       <jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
-      <!-- Tells Sonar where the Jacoco coverage result file is located for
-         Unit Tests -->
       <sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
-      <!-- Jacoco output file for ITs -->
       <jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
-      <!-- Tells Sonar where the Jacoco coverage result file is located for
-         Integration Tests -->
       <sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
       <!-- Sonar - END-->
    </properties>
@@ -295,7 +276,6 @@
                   <forkCount>1</forkCount>
                   <argLine>
                      ${jacoco.agent.ut.arg}
-                     -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
                   </argLine>
                   <properties>
                      <property>
@@ -312,13 +292,6 @@
                      <exclude>**/Abstract*.java</exclude>
                   </excludes>
                </configuration>
-               <dependencies>
-                  <dependency>
-                     <groupId>org.aspectj</groupId>
-                     <artifactId>aspectjweaver</artifactId>
-                     <version>${aspectj.version}</version>
-                  </dependency>
-               </dependencies>
             </plugin>
             <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -326,8 +299,7 @@
                <configuration>
                   <reuseForks>true</reuseForks>
                   <forkCount>3</forkCount>
-                  <argLine>-Xmx1024m ${jacoco.agent.ut.arg}
-                     -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"</argLine>
+                  <argLine>-Xmx1024m ${jacoco.agent.ut.arg}</argLine>
                   <properties>
                      <property>
                         <name>listener</name>
@@ -335,13 +307,6 @@
                      </property>
                   </properties>
                </configuration>
-               <dependencies>
-                  <dependency>
-                     <groupId>org.aspectj</groupId>
-                     <artifactId>aspectjweaver</artifactId>
-                     <version>${aspectj.version}</version>
-                  </dependency>
-               </dependencies>
                <executions>
                   <execution>
                      <id>integration-test</id>