diff --git a/LiteCharms.Abstractions/LiteCharms.Abstractions.csproj b/LiteCharms.Abstractions/LiteCharms.Abstractions.csproj
index 7614de0..4074ad4 100644
--- a/LiteCharms.Abstractions/LiteCharms.Abstractions.csproj
+++ b/LiteCharms.Abstractions/LiteCharms.Abstractions.csproj
@@ -11,7 +11,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Abstractions</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Shared abstractions for Lite Charms applications.</Description>
diff --git a/LiteCharms.Entities/LiteCharms.Entities.csproj b/LiteCharms.Entities/LiteCharms.Entities.csproj
index 6def4d4..b32a09d 100644
--- a/LiteCharms.Entities/LiteCharms.Entities.csproj
+++ b/LiteCharms.Entities/LiteCharms.Entities.csproj
@@ -11,7 +11,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Entities</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Shared entities for Lite Charms applications.</Description>
diff --git a/LiteCharms.Extensions/LiteCharms.Extensions.csproj b/LiteCharms.Extensions/LiteCharms.Extensions.csproj
index 1e19321..3f531b7 100644
--- a/LiteCharms.Extensions/LiteCharms.Extensions.csproj
+++ b/LiteCharms.Extensions/LiteCharms.Extensions.csproj
@@ -22,7 +22,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Extensions</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Extension components for Lite Charms applications.</Description>
@@ -49,6 +49,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
     <PackageReference Include="Quartz.AspNetCore" Version="3.18.1" />
+    <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.18.1" />
 
     <!-- Global Usings -->
     <Using Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
diff --git a/LiteCharms.Extensions/Quartz.cs b/LiteCharms.Extensions/Quartz.cs
index a8ee941..ea71879 100644
--- a/LiteCharms.Extensions/Quartz.cs
+++ b/LiteCharms.Extensions/Quartz.cs
@@ -17,7 +17,7 @@ public static class Quartz
         {
             config.SchedulerName = schedulerName;
             config.SchedulerId = schedulerId;
-
+                        
             config.UseSimpleTypeLoader();
             config.UseDefaultThreadPool(options => options.MaxConcurrency = 0);
             config.UseTimeZoneConverter();
diff --git a/LiteCharms.Extensions/ServiceBus.cs b/LiteCharms.Extensions/ServiceBus.cs
index e71c074..ab8d7c0 100644
--- a/LiteCharms.Extensions/ServiceBus.cs
+++ b/LiteCharms.Extensions/ServiceBus.cs
@@ -1,26 +1,27 @@
 using LiteCharms.Abstractions;
 using LiteCharms.Infrastructure.ServiceBus;
 using LiteCharms.Infrastructure.ServiceBus.Exchanges;
+using LiteCharms.Infrastructure.ServiceBus.Queues;
 
 namespace LiteCharms.Extensions;
 
 public static class ServiceBus
 {
     public static IServiceCollection AddGeneralServiceBus(this IServiceCollection services) => services
-        .AddTransient<GeneralServiceBus>()
+        .AddSingleton<GeneralQueue>()
         .AddHostedService<GeneralExchange>()
-        .AddKeyedTransient<IEventBus, GeneralServiceBus>(Constants.GeneralServiceBus)
+        .AddKeyedSingleton<IEventBus, GeneralServiceBus>(Constants.GeneralServiceBus)
         .AddMemoryCache();
 
     public static IServiceCollection AddEmailServiceBus(this IServiceCollection services) => services
-        .AddTransient<EmailServiceBus>()
+        .AddSingleton<EmailQueue>()
         .AddHostedService<EmailExchange>()
         .AddKeyedTransient<IEventBus, EmailServiceBus>(Constants.EmailServiceBus)
         .AddMemoryCache();
 
     public static IServiceCollection AddSalesServiceBus(this IServiceCollection services) => services
-        .AddTransient<SalesServiceBus>()
+        .AddSingleton<SalesQueue>()
         .AddHostedService<SalesExchange>()
-        .AddKeyedTransient<IEventBus, SalesServiceBus>(Constants.SalesServiceBus)
+        .AddKeyedSingleton<IEventBus, SalesServiceBus>(Constants.SalesServiceBus)
         .AddMemoryCache();
 }
diff --git a/LiteCharms.Features/LiteCharms.Features.csproj b/LiteCharms.Features/LiteCharms.Features.csproj
index a0f6325..9a2a0ac 100644
--- a/LiteCharms.Features/LiteCharms.Features.csproj
+++ b/LiteCharms.Features/LiteCharms.Features.csproj
@@ -11,7 +11,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Features</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Feature components for Lite Charms applications.</Description>
diff --git a/LiteCharms.Infrastructure/LiteCharms.Infrastructure.csproj b/LiteCharms.Infrastructure/LiteCharms.Infrastructure.csproj
index b18410a..9647c3a 100644
--- a/LiteCharms.Infrastructure/LiteCharms.Infrastructure.csproj
+++ b/LiteCharms.Infrastructure/LiteCharms.Infrastructure.csproj
@@ -12,7 +12,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Infrastructure</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Infrastructure components for Lite Charms applications.</Description>
diff --git a/LiteCharms.Models/LiteCharms.Models.csproj b/LiteCharms.Models/LiteCharms.Models.csproj
index c3cd50b..95e00d1 100644
--- a/LiteCharms.Models/LiteCharms.Models.csproj
+++ b/LiteCharms.Models/LiteCharms.Models.csproj
@@ -11,7 +11,7 @@
   <!-- Nuget Package Details -->
   <PropertyGroup>
     <PackageId>LiteCharms.Models</PackageId>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
     <Authors>Khwezi Mngoma</Authors>
     <Company>Lite Charms (PTY) Ltd</Company>
     <Description>Shared models for Lite Charms applications.</Description>