diff --git a/TransactionProcessor.BusinessLogic/EventHandling/VoucherDomainEventHandler.cs b/TransactionProcessor.BusinessLogic/EventHandling/VoucherDomainEventHandler.cs
index a94ed4b5..dd01c5ca 100644
--- a/TransactionProcessor.BusinessLogic/EventHandling/VoucherDomainEventHandler.cs
+++ b/TransactionProcessor.BusinessLogic/EventHandling/VoucherDomainEventHandler.cs
@@ -158,7 +158,7 @@ private async Task<Result> HandleSpecificDomainEvent(VoucherIssuedEvent domainEv
                                                          CancellationToken cancellationToken)
     {
         // Get the voucher aggregate
-        Result<VoucherAggregate> voucherAggregateResult = await this.VoucherAggregateRepository.GetLatestVersion(domainEvent.AggregateId, cancellationToken);
+        Result<VoucherAggregate> voucherAggregateResult = await this.VoucherAggregateRepository.GetLatestVersion(domainEvent.VoucherId, cancellationToken);
         if (voucherAggregateResult.IsFailed)
             return ResultHelpers.CreateFailure(voucherAggregateResult);
 
diff --git a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
index bfdb2e6f..4ecf104d 100644
--- a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
+++ b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
@@ -41,6 +41,12 @@
     <None Update="Receipts\Email\Safaricom\TransactionAuthorised.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="VoucherMessages\VoucherEmail.html">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="VoucherMessages\VoucherSMS.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherEmail.html b/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherEmail.html
new file mode 100644
index 00000000..f25395e2
--- /dev/null
+++ b/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherEmail.html
@@ -0,0 +1,16 @@
+﻿<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+<h1>[OperatorIdentifier] Voucher</h1>
+
+<h3>Voucher Details</h3>
+<p><strong>Amount:</strong> [Value]</p>
+<p><strong>Voucher Code:</strong> [VoucherCode]</p>
+<img src="data:image/png;base64, [Barcode]"/>
+</body>
+</html>
\ No newline at end of file
diff --git a/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherSMS.txt b/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherSMS.txt
new file mode 100644
index 00000000..e1b93729
--- /dev/null
+++ b/TransactionProcessor.BusinessLogic/VoucherMessages/VoucherSMS.txt
@@ -0,0 +1,4 @@
+﻿﻿[OperatorIdentifier] Voucher  
+
+Amount: [Value] 
+Voucher Code: [VoucherCode]
\ No newline at end of file
