diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala
index 31a7c04a6..a7e4a1d53 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala
@@ -34,6 +34,10 @@ object AmountFormatter extends Logging {
 
   def formatAmount(amount: String): String = formatter.format(toDouble(amount))
   def formatAmountInPence(amountInPence: String): String = formatter.format(toDouble(amountInPence) / 100)
+  def formatAmountInPenceGdsFormat(amountInPence: String): String =
+    formatter
+      .format(toDouble(amountInPence) / 100)
+      .replace(".00", "")
 
   private def toDouble(s: String): Double =
     Try(s.toDouble)
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html
index 837c5d965..2dbbfffc8 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,18 +42,18 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
                         <tr>
                         <th>Total paid</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt
index 7678a8a32..072aa65fa 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -38,14 +38,14 @@
 
 
             Amount
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total paid
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
 
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html
index 4b5cb0abf..4037cfc7a 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm a dalwyd</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt
index 2e5e63120..518c7d50a 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Swm
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm a dalwyd
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
     Os oes gennych gyfrif treth ar-lein, bydd eich taliad yn cymryd 3 i 5 diwrnod i ymddangos yn eich cyfrif.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html
index ea908aec9..bb8c249eb 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt
index 8be0a452e..487494f87 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -35,14 +35,14 @@ Your card payment to HMRC has not been made. No money has been taken from your a
               @params("transactionReference")
 
               Amount
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
 If you still need to pay
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html
index e83216514..82d25f2a1 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt
index c1266c7a8..9dd6736af 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@ Nid yw’r taliad drwy ddefnyddio’ch cerdyn wedi’i gyflwyno i CThEF. Does di
               @params("transactionReference")
 
               Swm
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
 Os oes dal angen i chi dalu
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html
index 081ba7691..b46a0e335 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total paid</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt
index 62886bf17..b08d3a9c5 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Amount
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total paid
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
             Card type
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html
index 0f2442cbf..483459467 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm a dalwyd</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt
index 30da2a23b..5136b4664 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Swm
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm a dalwyd
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
             Math o gerdyn
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html
index f18f6da68..d91832137 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.txt
index 05e2b165d..a36ae6cd4 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -32,14 +32,14 @@ Your card payment to HMRC has not been made. No money has been taken from your a
               @params("transactionReference")
 
               Amount
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
               Card type
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.html
index ed36ea38f..d9e2fd0ae 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.txt
index 5cf44b1df..174e02607 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -32,14 +32,14 @@ Nid yw’r taliad drwy ddefnyddio’ch cerdyn wedi’i gyflwyno i CThEF. Does di
               @params("transactionReference")
 
               Swm
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
               Math o gerdyn