diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
index 1d1ead5e8..487604081 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java
@@ -22,14 +22,6 @@ public class CreateOrUpdateDossierTemplateRequest {
 
     private String description;
 
-    private OffsetDateTime dateAdded;
-
-    private OffsetDateTime dateModified;
-
-    private String createdBy;
-
-    private String modifiedBy;
-
     private OffsetDateTime validFrom;
 
     private OffsetDateTime validTo;
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 d2911af6d..f3132f39a 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
@@ -64,8 +64,8 @@ public class FileStatusPersistenceService {
             file.setLegalBasisVersion(legalBasisVersion);
             file.setAnalysisDuration(duration);
             file.setDossierDictionaryVersion(dossierDictionaryVersion);
-            file.setNumberOfAnalyses(file.getNumberOfAnalyses()+1);
             file.setAnalysisVersion(analysisVersion);
+            file.setNumberOfAnalyses(file.getNumberOfAnalyses()+1);
             file.setLastUpdated(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
             file.setLastProcessed(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
         }, () -> {
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java
index 3767b1dcb..ba6f4ad77 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java
@@ -21,9 +21,6 @@ public class DossierTemplateTesterAndProvider {
 
     public DossierTemplate provideTestTemplate() {
         CreateOrUpdateDossierTemplateRequest cru = new CreateOrUpdateDossierTemplateRequest();
-        cru.setCreatedBy("1");
-        cru.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
-        cru.setDateModified(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
         cru.setDownloadFileTypes(Sets.newHashSet(DownloadFileType.ORIGINAL));
         cru.setName("Template 1");
         cru.setDescription("Template 1");