diff --git a/tomcat-base/build.gradle b/tomcat-base/build.gradle
index b6bcd69f..2e74b913 100644
--- a/tomcat-base/build.gradle
+++ b/tomcat-base/build.gradle
@@ -131,4 +131,9 @@ subprojects {
     }
 
     apply from: "${rootProject.projectDir}/tomcat-base/publish.gradle"
+    sonarqube {
+        properties {
+            property "sonar.exclusions", "$project.parent.projectDir/src/shared/main/java/eu/xenit/alfresco/embedded/tomcat"
+        }
+    }
 }
\ No newline at end of file
diff --git a/tomcat-base/tomcat-embedded-10/overload.gradle b/tomcat-base/tomcat-embedded-10/overload.gradle
index a3ba078f..8b65a3c8 100644
--- a/tomcat-base/tomcat-embedded-10/overload.gradle
+++ b/tomcat-base/tomcat-embedded-10/overload.gradle
@@ -4,8 +4,8 @@ ext {
     ]
 }
 // We only "test" this code via sonarcube. Otherwise we get duplicate code errors
-sonarqube {
-    properties {
-        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared"
-    }
-}
\ No newline at end of file
+//sonarqube {
+//    properties {
+//        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared"
+//    }
+//}
\ No newline at end of file
diff --git a/tomcat-base/tomcat-embedded-8.5/overload.gradle b/tomcat-base/tomcat-embedded-8.5/overload.gradle
index 7a550d25..f6c2f5ef 100644
--- a/tomcat-base/tomcat-embedded-8.5/overload.gradle
+++ b/tomcat-base/tomcat-embedded-8.5/overload.gradle
@@ -2,10 +2,4 @@ ext {
     tomcat = [
             version: '8.5.78'
     ]
-}
-sonarqube {
-    properties {
-//        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/main/java"
-        property "sonar.exclusions", "$project.parent.projectDir/src/shared/main/java"
-    }
 }
\ No newline at end of file
diff --git a/tomcat-base/tomcat-embedded-9/overload.gradle b/tomcat-base/tomcat-embedded-9/overload.gradle
index 45f21399..7ff2f22c 100644
--- a/tomcat-base/tomcat-embedded-9/overload.gradle
+++ b/tomcat-base/tomcat-embedded-9/overload.gradle
@@ -2,10 +2,4 @@ ext {
     tomcat = [
             version: '9.0.59'
     ]
-}
-sonarqube {
-    properties {
-//        property 'sonar.projectBaseDir', "$project.parent.projectDir/src/shared/main/java"
-        property "sonar.exclusions", "$project.parent.projectDir/src/shared/main/java"
-    }
 }
\ No newline at end of file