diff --git a/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImpl.java b/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImpl.java
index f503cc00..36457ab7 100644
--- a/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImpl.java
+++ b/src/main/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImpl.java
@@ -258,12 +258,12 @@ private String getDebtorTaxCode(BizEvent event) throws TemplateDataMappingExcept
     }
 
     private String getPayeeName(BizEvent event) {
-        return event.getCreditor() != null ? event.getCreditor().getOfficeName() : null;
+        return event.getCreditor() != null ? event.getCreditor().getCompanyName() : null;
     }
 
     private String getPayeeTaxCode(BizEvent event) throws TemplateDataMappingException {
-        if (event.getCreditor() != null && event.getCreditor().getCompanyName() != null) {
-            return event.getCreditor().getCompanyName();
+        if (event.getCreditor() != null && event.getCreditor().getIdPA() != null) {
+            return event.getCreditor().getIdPA();
         }
         throw new TemplateDataMappingException(formatErrorMessage(TemplateDataField.CART_ITEM_PAYEE_TAX_CODE), ReasonErrorCode.ERROR_TEMPLATE_PDF.getCode());
     }
diff --git a/src/test/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImplTest.java b/src/test/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImplTest.java
index 5b3580bb..f12ff854 100644
--- a/src/test/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImplTest.java
+++ b/src/test/java/it/gov/pagopa/receipt/pdf/generator/service/impl/BuildTemplateServiceImplTest.java
@@ -16,7 +16,6 @@
 
 class BuildTemplateServiceImplTest {
     public static final String COMPANY_NAME = "PA paolo";
-    public static final String OFFICE_NAME = "office PA";
     public static final String ID_PSP = "ID_PSP";
     public static final String DEBTOR_FULL_NAME = "John Doe";
     public static final String DEBTOR_VALID_CF = "CF_DEBTOR";
@@ -61,6 +60,7 @@ class BuildTemplateServiceImplTest {
     private static final String PAGO_PA_CHANNEL_IO = "IO";
     private static final String PAGO_PA_CHANNEL_IO_PAY = "IO-PAY";
     private static final String NOT_PAGO_PA_CHANNEL = "NOT_PAGO_PA_CHANNEL";
+    public static final String ID_PA = "idPa";
     private BuildTemplateServiceImpl buildTemplateService;
 
     @BeforeEach
@@ -82,7 +82,7 @@ void mapTemplateAllFieldsSuccessCompleteTemplateAndIOChannel() throws Exception
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
-                        .officeName(OFFICE_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .psp(Psp.builder()
                         .idPsp(ID_PSP)
@@ -156,8 +156,8 @@ void mapTemplateAllFieldsSuccessCompleteTemplateAndIOChannel() throws Exception
         assertEquals(DEBTOR_FULL_NAME, cart.getItems().get(0).getDebtor().getFullName());
         assertEquals(DEBTOR_VALID_CF, cart.getItems().get(0).getDebtor().getTaxCode());
         assertEquals(REMITTANCE_INFORMATION, cart.getItems().get(0).getSubject());
-        assertEquals(OFFICE_NAME, cart.getItems().get(0).getPayee().getName());
-        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getTaxCode());
+        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getName());
+        assertEquals(ID_PA, cart.getItems().get(0).getPayee().getTaxCode());
         assertEquals(MODEL_TYPE_IUV_TEXT, cart.getItems().get(0).getRefNumber().getType());
         assertEquals(IUV, cart.getItems().get(0).getRefNumber().getValue());
     }
@@ -172,7 +172,7 @@ void mapTemplateAllFieldsSuccessCompleteTemplateAndIOPAYChannel() throws Excepti
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
-                        .officeName(OFFICE_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .psp(Psp.builder()
                         .idPsp(ID_PSP)
@@ -246,8 +246,8 @@ void mapTemplateAllFieldsSuccessCompleteTemplateAndIOPAYChannel() throws Excepti
         assertEquals(DEBTOR_FULL_NAME, cart.getItems().get(0).getDebtor().getFullName());
         assertEquals(DEBTOR_VALID_CF, cart.getItems().get(0).getDebtor().getTaxCode());
         assertEquals(REMITTANCE_INFORMATION, cart.getItems().get(0).getSubject());
-        assertEquals(OFFICE_NAME, cart.getItems().get(0).getPayee().getName());
-        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getTaxCode());
+        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getName());
+        assertEquals(ID_PA, cart.getItems().get(0).getPayee().getTaxCode());
         assertEquals(MODEL_TYPE_IUV_TEXT, cart.getItems().get(0).getRefNumber().getType());
         assertEquals(IUV, cart.getItems().get(0).getRefNumber().getValue());
     }
@@ -262,7 +262,7 @@ void mapTemplateAllFieldsSuccessPartialTemplateAndNotPagoPaChannel() throws Exce
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
-                        .officeName(OFFICE_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .psp(Psp.builder()
                         .idPsp(ID_PSP)
@@ -335,8 +335,8 @@ void mapTemplateAllFieldsSuccessPartialTemplateAndNotPagoPaChannel() throws Exce
         assertEquals(DEBTOR_FULL_NAME, cart.getItems().get(0).getDebtor().getFullName());
         assertEquals(DEBTOR_VALID_CF, cart.getItems().get(0).getDebtor().getTaxCode());
         assertEquals(REMITTANCE_INFORMATION, cart.getItems().get(0).getSubject());
-        assertEquals(OFFICE_NAME, cart.getItems().get(0).getPayee().getName());
-        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getTaxCode());
+        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getName());
+        assertEquals(ID_PA, cart.getItems().get(0).getPayee().getTaxCode());
         assertEquals(MODEL_TYPE_NOTICE_TEXT, cart.getItems().get(0).getRefNumber().getType());
         assertEquals(IUV, cart.getItems().get(0).getRefNumber().getValue());
     }
@@ -351,7 +351,7 @@ void mapTemplateWithoutTransactionDetailsSuccess() throws Exception {
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
-                        .officeName(OFFICE_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .psp(Psp.builder()
                         .idPsp(ID_PSP)
@@ -407,8 +407,8 @@ void mapTemplateWithoutTransactionDetailsSuccess() throws Exception {
         assertEquals(DEBTOR_FULL_NAME, cart.getItems().get(0).getDebtor().getFullName());
         assertEquals(DEBTOR_VALID_CF, cart.getItems().get(0).getDebtor().getTaxCode());
         assertEquals(REMITTANCE_INFORMATION, cart.getItems().get(0).getSubject());
-        assertEquals(OFFICE_NAME, cart.getItems().get(0).getPayee().getName());
-        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getTaxCode());
+        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getName());
+        assertEquals(ID_PA, cart.getItems().get(0).getPayee().getTaxCode());
         assertEquals(MODEL_TYPE_IUV_TEXT, cart.getItems().get(0).getRefNumber().getType());
         assertEquals(IUV, cart.getItems().get(0).getRefNumber().getValue());
     }
@@ -423,7 +423,7 @@ void mapTemplateWithoutTransactionDetailsAndPaymentTokenSuccess() throws Excepti
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
-                        .officeName(OFFICE_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .psp(Psp.builder()
                         .idPsp(ID_PSP)
@@ -477,8 +477,8 @@ void mapTemplateWithoutTransactionDetailsAndPaymentTokenSuccess() throws Excepti
         assertEquals(DEBTOR_FULL_NAME, cart.getItems().get(0).getDebtor().getFullName());
         assertEquals(DEBTOR_VALID_CF, cart.getItems().get(0).getDebtor().getTaxCode());
         assertEquals(REMITTANCE_INFORMATION, cart.getItems().get(0).getSubject());
-        assertEquals(OFFICE_NAME, cart.getItems().get(0).getPayee().getName());
-        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getTaxCode());
+        assertEquals(COMPANY_NAME, cart.getItems().get(0).getPayee().getName());
+        assertEquals(ID_PA, cart.getItems().get(0).getPayee().getTaxCode());
         assertEquals(MODEL_TYPE_IUV_TEXT, cart.getItems().get(0).getRefNumber().getType());
         assertEquals(IUV, cart.getItems().get(0).getRefNumber().getValue());
     }
@@ -508,7 +508,7 @@ void mapTemplateLeastAmountOfInfoSuccess() {
                         .entityUniqueIdentifierValue(DEBTOR_VALID_CF)
                         .build())
                 .creditor(Creditor.builder()
-                        .companyName(COMPANY_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .transactionDetails(TransactionDetails.builder()
                         .transaction(Transaction.builder()
@@ -918,6 +918,7 @@ void mapTemplateNoCartItemAmountValueError() {
                         .build())
                 .creditor(Creditor.builder()
                         .companyName(COMPANY_NAME)
+                        .idPA(ID_PA)
                         .build())
                 .transactionDetails(TransactionDetails.builder()
                         .transaction(Transaction.builder()