diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
index dbe3ccfce..c817f40cb 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/DossierTemplatePersistenceService.java
@@ -19,7 +19,6 @@ import com.iqser.red.service.persistence.management.v1.processor.exception.Confl
 import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
 import com.iqser.red.service.persistence.management.v1.processor.service.ComponentMappingService;
 import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryManagementService;
-import com.iqser.red.service.persistence.management.v1.processor.service.DossierService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierTemplateRepository;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.TypeRepository;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
@@ -33,22 +32,22 @@ import lombok.experimental.FieldDefaults;
 
 @Service
 @RequiredArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@FieldDefaults(level = AccessLevel.PRIVATE)
 public class DossierTemplatePersistenceService {
 
     @Value("${application.type}")
     private String applicationType;
 
-    public static String DOSSIER_TEMPLATE_NOT_FOUND_MESSAGE = "DossierTemplate with Id %s not found.";
+    public static final String DOSSIER_TEMPLATE_NOT_FOUND_MESSAGE = "DossierTemplate with Id %s not found.";
 
-    DossierTemplateRepository dossierTemplateRepository;
-    LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
-    RulesPersistenceService rulesPersistenceService;
-    DictionaryPersistenceService dictionaryPersistenceService;
-    DictionaryManagementService dictionaryManagementService;
-    ComponentMappingService componentMappingService;
+    final DossierTemplateRepository dossierTemplateRepository;
+    final LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
+    final RulesPersistenceService rulesPersistenceService;
+    final DictionaryPersistenceService dictionaryPersistenceService;
+    final DictionaryManagementService dictionaryManagementService;
+    final ComponentMappingService componentMappingService;
 
-    TypeRepository typeRepository;
+    final TypeRepository typeRepository;
 
     static int MAX_NAME_LENGTH = 255;
     static int MAX_DESCRIPTION_LENGTH = 4000;
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java
index a46400ade..fa65d9c33 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java
@@ -127,8 +127,7 @@ public class DossierTemplateCloneAndExportWithDuplicateRanksTest {
 
         mapper = ObjectMapperFactory.create();
 
-        dossierTemplatePersistenceService = new DossierTemplatePersistenceService("RedactManager",
-                                                                                  dossierTemplateRepository,
+        dossierTemplatePersistenceService = new DossierTemplatePersistenceService(dossierTemplateRepository,
                                                                                   legalBasisMappingPersistenceService,
                                                                                   rulesPersistenceService,
                                                                                   dictionaryPersistenceService,
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneServiceTest.java
index d4dc320df..698593428 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneServiceTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneServiceTest.java
@@ -113,8 +113,7 @@ public class DossierTemplateCloneServiceTest {
     @SneakyThrows
     public void setUp() {
 
-        dossierTemplatePersistenceService = new DossierTemplatePersistenceService("RedactManager",
-                                                                                  dossierTemplateRepository,
+        dossierTemplatePersistenceService = new DossierTemplatePersistenceService(dossierTemplateRepository,
                                                                                   legalBasisMappingPersistenceService,
                                                                                   rulesPersistenceService,
                                                                                   dictionaryPersistenceService,