diff --git a/src/main/java/codes/thischwa/jdvs/config/GitConfig.java b/src/main/java/codes/thischwa/jdvs/config/GitConfig.java
new file mode 100644
index 0000000..3fa457b
--- /dev/null
+++ b/src/main/java/codes/thischwa/jdvs/config/GitConfig.java
@@ -0,0 +1,13 @@
+package codes.thischwa.jdvs.config;
+
+import java.util.List;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "git")
+@Data
+public class GitConfig {
+  private List<String> javadocPaths;
+}
diff --git a/src/main/java/codes/thischwa/jdvs/service/MavenSourceService.java b/src/main/java/codes/thischwa/jdvs/service/MavenSourceService.java
index 0b74ec0..cc714a4 100644
--- a/src/main/java/codes/thischwa/jdvs/service/MavenSourceService.java
+++ b/src/main/java/codes/thischwa/jdvs/service/MavenSourceService.java
@@ -1,5 +1,6 @@
 package codes.thischwa.jdvs.service;
 
+import codes.thischwa.jdvs.config.GitConfig;
 import codes.thischwa.jdvs.config.JdvsConfig;
 import codes.thischwa.jdvs.config.JdvsConfig.RepoConfig;
 import java.io.BufferedReader;
@@ -30,6 +31,7 @@ import org.xml.sax.InputSource;
 public class MavenSourceService {
 
   private final JdvsConfig jdvsConfig;
+  private final GitConfig gitConfig;
   private final RestClient restClient = RestClient.create();
 
   public Optional<String> fetchLatestVersion(String repoName) {
@@ -68,6 +70,7 @@ public class MavenSourceService {
     Path workDir = null;
     try {
       workDir = Files.createTempDirectory("jdvs-maven-" + repoName + "-");
+      log.info("Created temporary working directory {}", workDir);
       Path srcMainJava = workDir.resolve("src/main/java");
       Files.createDirectories(srcMainJava);
       downloadAndExtract(jarUrl, workDir, srcMainJava);
@@ -129,11 +132,16 @@ public class MavenSourceService {
     Path mavenLocalRepo = Path.of(jdvsConfig.getBaseDir(), "maven-repo").toAbsolutePath();
     Files.createDirectories(mavenLocalRepo);
 
+    // create empty sonar-project.properties so properties-maven-plugin doesn't fail
+    Files.createFile(workDir.resolve("sonar-project.properties"));
+
     List<String> cmd = new ArrayList<>(List.of(
         "mvn", "-U", "--no-transfer-progress",
         "clean", "javadoc:javadoc",
         "-Djacoco.skip=true",
         "-DskipTests",
+        "-Dsonar.skip=true",
+        "-Dmaven.javadoc.skip=false",
         "-Dcheckstyle.skip=true",
         "-Dlombok.delombok.skip=true",
         "-Dmaven.repo.local=" + mavenLocalRepo
@@ -159,9 +167,12 @@ public class MavenSourceService {
       return false;
     }
 
-    Path apidocsDir = workDir.resolve("target/reports/apidocs");
-    if (!Files.exists(apidocsDir)) {
-      // Log actual target content to find where Maven put the output
+    Path apidocsDir = gitConfig.getJavadocPaths().stream()
+        .map(workDir::resolve)
+        .filter(Files::exists)
+        .findFirst()
+        .orElse(null);
+    if (apidocsDir == null) {
       Path targetDir = workDir.resolve("target");
       if (Files.exists(targetDir)) {
         try (var s = Files.walk(targetDir, 4)) {
@@ -177,6 +188,7 @@ public class MavenSourceService {
       }
       return false;
     }
+    log.debug("Found apidocs directory at: {}", apidocsDir);
     copyDirectory(apidocsDir, outputDir);
     log.info("Javadoc successfully generated for {} in {}", repoName, outputDir);
     return true;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 45a82f3..2b8e8df 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,6 +5,12 @@ jdvs:
   run-on-start: false
   maven-central-url: https://repo1.maven.org/maven2
 
+git:
+  javadoc-paths:
+    - target/reports/apidocs
+    - target/apidocs
+    - target/site/apidocs
+
 ## import of the individual configuration settings
 spring:
   config: