diff --git a/template/pain.001.001.03.xml b/template/pain.001.001.03.xml
index 25073f6afc..22976c4832 100644
--- a/template/pain.001.001.03.xml
+++ b/template/pain.001.001.03.xml
@@ -28,7 +28,7 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrCdtTrfInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
             <!-- Authstn -->
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
diff --git a/template/pain.001.001.05.xml b/template/pain.001.001.05.xml
index 319afcbbbb..9d8651c3fe 100644
--- a/template/pain.001.001.05.xml
+++ b/template/pain.001.001.05.xml
@@ -9,7 +9,7 @@ this repository contains the full copyright notices and license terms. -->
     <xi:include href="base.xml"/>
     <CstmrCdtTrfInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
             <!-- Authstn -->
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
diff --git a/template/pain.001.003.03.xml b/template/pain.001.003.03.xml
index 9b613b4b29..690e93b968 100644
--- a/template/pain.001.003.03.xml
+++ b/template/pain.001.003.03.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
     <xi:include href="base.003.xml"/>
     <CstmrCdtTrfInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().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.xml b/template/pain.008.001.02.xml
index 86a28ef757..b8ecc19ec8 100644
--- a/template/pain.008.001.02.xml
+++ b/template/pain.008.001.02.xml
@@ -28,7 +28,7 @@ this repository contains the full copyright notices and license terms. -->
     </py:def>
     <CstmrDrctDbtInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
             <!-- Authstn -->
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
diff --git a/template/pain.008.001.04.xml b/template/pain.008.001.04.xml
index 57c680e8d1..40a994c3fb 100644
--- a/template/pain.008.001.04.xml
+++ b/template/pain.008.001.04.xml
@@ -9,7 +9,7 @@ this repository contains the full copyright notices and license terms. -->
     <xi:include href="base.xml"/>
     <CstmrDrctDbtInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
             <!-- Authstn -->
             <NbOfTxs>${len(group.payments)}</NbOfTxs>
diff --git a/template/pain.008.003.02.xml b/template/pain.008.003.02.xml
index 7fdb45d45d..04d4fb7cd7 100644
--- a/template/pain.008.003.02.xml
+++ b/template/pain.008.003.02.xml
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
     <xi:include href="base.003.xml"/>
     <CstmrDrctDbtInitn>
         <GrpHdr>
-            <MsgId>${group.reference[:35]}</MsgId>
+            <MsgId>${group.number[:35]}</MsgId>
             <CreDtTm>${datetime.datetime.now().isoformat()}</CreDtTm>
             <NbOfTxs>${sum(len(payments) for _, payments in group.sepa_payments)}</NbOfTxs>
             <CtrlSum>${sum(p.amount for p in group.payments)}</CtrlSum>