diff --git a/src/main/java/it/gov/pagopa/wispconverter/repository/model/RTRequestEntity.java b/src/main/java/it/gov/pagopa/wispconverter/repository/model/RTRequestEntity.java
index 881bdd18..9ee77dfb 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/repository/model/RTRequestEntity.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/repository/model/RTRequestEntity.java
@@ -3,6 +3,7 @@
 import com.azure.spring.data.cosmos.core.mapping.Container;
 import com.azure.spring.data.cosmos.core.mapping.PartitionKey;
 import it.gov.pagopa.wispconverter.repository.model.enumz.ReceiptTypeEnum;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,7 +19,7 @@
 @ToString(exclude = "payload")
 @EqualsAndHashCode(exclude = "payload")
 @SuperBuilder(toBuilder = true)
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor
 public class RTRequestEntity {
 
diff --git a/src/main/java/it/gov/pagopa/wispconverter/repository/model/ReceiptDeadLetterEntity.java b/src/main/java/it/gov/pagopa/wispconverter/repository/model/ReceiptDeadLetterEntity.java
index ee0c84bf..2fd07b35 100644
--- a/src/main/java/it/gov/pagopa/wispconverter/repository/model/ReceiptDeadLetterEntity.java
+++ b/src/main/java/it/gov/pagopa/wispconverter/repository/model/ReceiptDeadLetterEntity.java
@@ -1,20 +1,22 @@
 package it.gov.pagopa.wispconverter.repository.model;
 
 import com.azure.spring.data.cosmos.core.mapping.Container;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 @Container(containerName = "receipt-dead-letter")
-@Data
-@ToString
-@EqualsAndHashCode(callSuper=false)
+@Getter
+@Setter
+@ToString(exclude = "payload")
+@EqualsAndHashCode(exclude = "payload")
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @SuperBuilder(toBuilder = true)
-@AllArgsConstructor
-@NoArgsConstructor
 public class ReceiptDeadLetterEntity extends RTRequestEntity {
 
 }