diff --git a/template/pain.001.001.03-cfonb.xml b/template/pain.001.001.03-cfonb.xml
index 982cfb29d4..38c1f490ad 100644
--- a/template/pain.001.001.03-cfonb.xml
+++ b/template/pain.001.001.03-cfonb.xml
@@ -23,7 +23,7 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrCdtTrfInitn>
         <GrpHdr>
-            <MsgId>${group.number[:35]}</MsgId>
+            <MsgId>${group.sepa_message_id[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().replace(microsecond=0).isoformat()}</CreDtTm>
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
             <CtrlSum>${sum(p.amount for p in group.payments)}</CtrlSum>
diff --git a/template/pain.008.001.02-cfonb.xml b/template/pain.008.001.02-cfonb.xml
index bf142d0c1e..7c784e811f 100644
--- a/template/pain.008.001.02-cfonb.xml
+++ b/template/pain.008.001.02-cfonb.xml
@@ -29,7 +29,7 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrDrctDbtInitn>
         <GrpHdr>
-            <MsgId>${group.number[:35]}</MsgId>
+            <MsgId>${group.sepa_message_id[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().replace(microsecond=0).isoformat()}</CreDtTm>
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
             <CtrlSum>${sum(p.amount for p in group.payments)}</CtrlSum>