diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
index c6b715907..22b18834b 100644
--- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
@@ -65,6 +65,11 @@ java {
 }
 
 allprojects {
+    tasks.withType<Javadoc> {
+        options {
+            extra["javadoc.options"] = listOf("-quiet", "-Xdoclint:none")
+        }
+    }
     publishing {
         publications {
             create<MavenPublication>(name) {
diff --git a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/FileStatusProcessingUpdateInternalController.java b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/FileStatusProcessingUpdateInternalController.java
index 7d530b5d5..846312fc8 100644
--- a/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/FileStatusProcessingUpdateInternalController.java
+++ b/persistence-service-v1/persistence-service-internal-api-impl-v1/src/main/java/com/iqser/red/service/persistence/v1/internal/api/controller/FileStatusProcessingUpdateInternalController.java
@@ -53,6 +53,7 @@ public class FileStatusProcessingUpdateInternalController implements FileStatusP
 
     public void analysisSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody AnalyzeResult analyzeResult) {
 
+        log.info("Received analysis result {}", analyzeResult);
         fileStatusProcessingUpdateService.analysisSuccessful(dossierId, fileId, analyzeResult);
     }
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusProcessingUpdateService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusProcessingUpdateService.java
index e8a48209b..042eb402f 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusProcessingUpdateService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusProcessingUpdateService.java
@@ -3,6 +3,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service;
 import org.apache.commons.lang3.StringUtils;
 
 import org.springframework.retry.support.RetryTemplate;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
index 234b3cee3..6db7163df 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReanalysisRequiredStatusService.java
@@ -180,12 +180,12 @@ public class ReanalysisRequiredStatusService {
 
         boolean needComma = false;
 
-        if (rulesVersionMatches) {
+        if (!rulesVersionMatches) {
             messageBuilder.append("ruleVersions: ").append(fileStatus.getRulesVersion()).append("/").append(dossierTemplateVersions.getOrDefault(RULES, -1L));
             needComma = true;
         }
 
-        if (componentRulesVersionMatches) {
+        if (!componentRulesVersionMatches) {
             if (needComma) {
                 messageBuilder.append(", ");
             }
@@ -196,7 +196,7 @@ public class ReanalysisRequiredStatusService {
             needComma = true;
         }
 
-        if (dictionaryVersionMatches) {
+        if (!dictionaryVersionMatches) {
             if (needComma) {
                 messageBuilder.append(", ");
             }
@@ -204,7 +204,7 @@ public class ReanalysisRequiredStatusService {
             needComma = true;
         }
 
-        if (legalBasisVersionMatches) {
+        if (!legalBasisVersionMatches) {
             if (needComma) {
                 messageBuilder.append(", ");
             }
@@ -212,7 +212,7 @@ public class ReanalysisRequiredStatusService {
             needComma = true;
         }
 
-        if (dossierDictionaryVersionMatches) {
+        if (!dossierDictionaryVersionMatches) {
             if (needComma) {
                 messageBuilder.append(", ");
             }
@@ -220,7 +220,7 @@ public class ReanalysisRequiredStatusService {
             needComma = true;
         }
 
-        if (mappingVersionAllMatch) {
+        if (!mappingVersionAllMatch) {
             if (needComma) {
                 messageBuilder.append(", ");
             }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
index 28c135809..928174edc 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java
@@ -130,10 +130,6 @@ public class FileStatusPersistenceService {
             return;
         }
 
-        List<FileEntityComponentMappingVersionEntity> versionEntities = usedComponentMappings.stream()
-                .map(cm -> new FileEntityComponentMappingVersionEntity(cm.getName(), cm.getVersion()))
-                .toList();
-
         fileRepository.updateProcessingStatus(fileId,
                                               numberOfPages,
                                               ProcessingStatus.PROCESSED,
@@ -147,8 +143,18 @@ public class FileStatusPersistenceService {
                                               OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS),
                                               OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS),
                                               analysisNumber,
-                                              calculateProcessingErrorCounter(fileId, ProcessingStatus.PROCESSED),
-                                              versionEntities);
+                                              calculateProcessingErrorCounter(fileId, ProcessingStatus.PROCESSED));
+
+        List<FileEntityComponentMappingVersionEntity> versionEntities = usedComponentMappings.stream()
+                .map(cm -> new FileEntityComponentMappingVersionEntity(cm.getName(), cm.getVersion()))
+                .toList();
+
+        FileEntity file = fileRepository.findById(fileId)
+                .orElseThrow(() -> new NotFoundException("File with id " + fileId + "not found!"));
+        
+        file.setComponentMappingVersions(versionEntities);
+
+        fileRepository.save(file);
 
         websocketService.sendAnalysisEvent(dossierId, fileId, AnalyseStatus.FINISHED, analysisNumber);
     }
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
index afe318ea4..6379bbce2 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/FileRepository.java
@@ -10,7 +10,6 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntityComponentMappingVersionEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.projection.FilePageCountsProjection;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.projection.FileProcessingStatusProjection;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.projection.FileWorkflowStatusProjection;
@@ -61,8 +60,7 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
             f.numberOfAnalyses = :analysisNumber, \
             f.lastUpdated = :lastUpdated, \
             f.lastProcessed = :lastProcessed, \
-            f.processingErrorCounter = :processingErrorCounter, \
-            f.componentMappingVersions = :componentMappingVersions \
+            f.processingErrorCounter = :processingErrorCounter \
             where f.id = :fileId""")
     void updateProcessingStatus(@Param("fileId") String fileId,
                                 @Param("numberOfPages") int numberOfPages,
@@ -77,9 +75,7 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
                                 @Param("lastUpdated") OffsetDateTime lastUpdated,
                                 @Param("lastProcessed") OffsetDateTime lastProcessed,
                                 @Param("analysisNumber") int analysisNumber,
-                                @Param("processingErrorCounter") int processingErrorCounter,
-                                @Param("componentMappingVersions")
-                                List<FileEntityComponentMappingVersionEntity> versionEntities);
+                                @Param("processingErrorCounter") int processingErrorCounter);
 
 
     @Modifying