diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java
index f260be05c..bf053fd71 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/CreateOrUpdateDossierRequest.java
@@ -29,10 +29,13 @@ public class CreateOrUpdateDossierRequest {
 
     private String ownerId;
 
+    @Builder.Default
     private Set<String> memberIds = new HashSet<>();
 
+    @Builder.Default
     private Set<String> approverIds = new HashSet<>();
 
+    @Builder.Default
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
 
     private boolean watermarkEnabled;
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java
index 364d72fb0..830006024 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/ReportTemplateUploadRequest.java
@@ -14,8 +14,7 @@ public class ReportTemplateUploadRequest {
     private String dossierTemplateId;
     @NonNull
     private String fileName;
-    @NonNull
+
     private boolean multiFileReport;
-    @NonNull
     private boolean activeByDefault;
 }
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java
index 097986aab..dcddc3531 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/DigitalSignature.java
@@ -1,5 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
 
+import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,6 +11,7 @@ import javax.persistence.*;
 @Entity
 @NoArgsConstructor
 @AllArgsConstructor
+@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
 @Table(name = "digital_signature")
 public class DigitalSignature {
 
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
index 426441011..00d833efa 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java
@@ -1,5 +1,6 @@
 package com.iqser.red.service.persistence.service.v1.api.model.data.configuration;
 
+import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -10,6 +11,7 @@ import javax.persistence.Table;
 @Data
 @Entity
 @Table(name = "smtp_configuration")
+@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
 public class SMTPConfiguration {
 
     public final static String ID = "CONFIG_ID";
@@ -44,5 +46,4 @@ public class SMTPConfiguration {
     @Column
     private String password;
 
-
 }
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java
index aee8957dd..ab71fe5e2 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java
@@ -39,12 +39,15 @@ public class Dossier {
     @Column
     private String ownerId;
 
+    @Builder.Default
     @ElementCollection
     private Set<String> memberIds = new HashSet<>();
 
+    @Builder.Default
     @ElementCollection
     private Set<String> approverIds = new HashSet<>();
 
+    @Builder.Default
     @ElementCollection
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
 
@@ -69,12 +72,15 @@ public class Dossier {
     @Column(updatable = false, insertable = false, name = "dossier_template_id")
     private String dossierTemplateId;
 
+    @Builder.Default
     @ManyToMany(fetch = FetchType.LAZY, mappedBy = "dossiers")
     private List<ReportTemplate> reportTemplates = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "dossier")
     private List<Type> dossierTypes = new ArrayList<>();
 
+    @Builder.Default
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "dossier")
     private List<DossierAttribute> dossierAttributes = new ArrayList<>();
 
diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/utils/SuppressFBWarnings.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/utils/SuppressFBWarnings.java
new file mode 100644
index 000000000..5a7a529f5
--- /dev/null
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/utils/SuppressFBWarnings.java
@@ -0,0 +1,18 @@
+package com.iqser.red.service.persistence.service.v1.api.utils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.CLASS)
+public @interface SuppressFBWarnings {
+    /**
+     * The set of FindBugs warnings that are to be suppressed in
+     * annotated element. The value can be a bug category, kind or pattern.
+     */
+    String[] value() default {};
+
+    /**
+     * Optional documentation of the reason why the warning is suppressed.
+     */
+    String justification() default "";
+}