diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
index 7bcc65b52..f99e23cc0 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationService.java
@@ -15,10 +15,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,7 +46,6 @@ import com.iqser.red.service.peristence.v1.server.migration.model.NewIdForDossie
 import com.iqser.red.service.peristence.v1.server.migration.model.VersionRow;
 import com.iqser.red.service.peristence.v1.server.migration.model.VersionType;
 import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService;
-import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings;
 import com.iqser.red.service.peristence.v1.server.utils.StorageIdUtils;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.CommentEntity;
@@ -184,9 +179,9 @@ public class MigrationService {
         dossierTemplates.forEach(dossierTemplate -> {
             migrateDossierTemplate(dossierTemplate);
             log.info("Migrated dossierTemplates");
-            dossierAttributesOldIdToNewId.putAll(migrateDossierAttributeConfiguration(dossierTemplate.getDossierTemplateId(), configurationRows));
+            addValues(dossierAttributesOldIdToNewId,migrateDossierAttributeConfiguration(dossierTemplate.getDossierTemplateId(), configurationRows));
             log.info("Migrated dossier attributes config");
-            fileAttributesOldIdToNewId.putAll(migrateFileAttributeConfiguration(dossierTemplate.getDossierTemplateId(), configurationRows));
+            addValues(fileAttributesOldIdToNewId, migrateFileAttributeConfiguration(dossierTemplate.getDossierTemplateId(), configurationRows));
             log.info("Migrated file attributes config");
             migrateLegalBasis(dossierTemplate.getDossierTemplateId(), configurationRows, versions);
             log.info("Migrated legal basis");
@@ -243,6 +238,13 @@ public class MigrationService {
     }
 
 
+    private void addValues(Map<String, List<NewIdForDossierTemplate>> existing, Map<String, List<NewIdForDossierTemplate>> newValues){
+        newValues.entrySet().forEach(entry -> {
+            existing.computeIfAbsent(entry.getKey(), x -> new ArrayList<>()).addAll(entry.getValue());
+        });
+    }
+
+
     private void migrateRedactionLogs() {
 
         List<FileEntity> files = fileRepository.findAll();
@@ -707,7 +709,7 @@ public class MigrationService {
                     .hardDeletedTime(oldDossier.getHardDeletedTime())
                     .dueDate(oldDossier.getDueDate())
                     .dossierTemplate(dossierTemplateRepository.getOne(oldDossier.getDossierTemplateId()))
-//                    .dossierTemplateId(oldDossier.getDossierTemplateId())
+                    .dossierTemplateId(oldDossier.getDossierTemplateId())
                     .reportTemplates(reportTemplates)
                     .build();
 
@@ -854,7 +856,7 @@ public class MigrationService {
                     .analysisVersion(oldFile.getAnalysisVersion())
                     .excludedPages(oldFile.getExcludedPages())
                     .dossier(dossierEntity)
-//                    .dossierId(oldFile.getDossierId())
+                    .dossierId(oldFile.getDossierId())
                     .build();
 
             List<FileAttributeEntity> convertedFileAttributes = new ArrayList<>();