diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6b7d5f032..78897e952 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -29,16 +29,14 @@
     <PackageVersion Include="FastEndpoints.ApiExplorer" Version="2.2.0" />
     <PackageVersion Include="FastEndpoints.Swagger" Version="5.19.2" />
     <PackageVersion Include="FastEndpoints.Swagger.Swashbuckle" Version="2.2.0" />
-<<<<<<< HEAD
     <PackageVersion Include="FluentAssertions" Version="8.9.0" />
-=======
->>>>>>> 30bbccbd14334429aa307ef9870a7dd4bde269ca
     <PackageVersion Include="Flurl" Version="4.0.0" />
     <PackageVersion Include="Flurl.Http" Version="4.0.2" />
     <PackageVersion Include="GoogleReCaptcha.V3" Version="1.3.1" />
     <PackageVersion Include="Markdig" Version="1.1.3" />
     <PackageVersion Include="MediaInfo.Wrapper.Core" Version="21.9.3" />
-    <PackageVersion Include="MediatR" Version="14.1.0" />
+    <PackageVersion Include="Mediator.Abstractions" Version="3.0.2" />
+    <PackageVersion Include="Mediator.SourceGenerator" Version="3.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
diff --git a/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj b/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj
index 4427bfd05..c8c41b2f2 100644
--- a/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj
+++ b/src/DevBetterWeb.Core/DevBetterWeb.Core.csproj
@@ -19,7 +19,7 @@
 		<PackageReference Include="Ardalis.SmartEnum" />
 		<PackageReference Include="Ardalis.Specification" />
 		<PackageReference Include="CSharpFunctionalExtensions" />
-		<PackageReference Include="MediatR" />
+		<PackageReference Include="Mediator.Abstractions" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
 		<PackageReference Include="Microsoft.Extensions.Identity.Core" />
 		<PackageReference Include="NimblePros.Vimeo" />
diff --git a/src/DevBetterWeb.Core/Events/AppStartedEvent.cs b/src/DevBetterWeb.Core/Events/AppStartedEvent.cs
index a99909094..cc987ec36 100644
--- a/src/DevBetterWeb.Core/Events/AppStartedEvent.cs
+++ b/src/DevBetterWeb.Core/Events/AppStartedEvent.cs
@@ -1,6 +1,6 @@
 using System;
 using DevBetterWeb.Core.SharedKernel;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.Core.Events;
 
diff --git a/src/DevBetterWeb.Core/Interfaces/IHandle.cs b/src/DevBetterWeb.Core/Interfaces/IHandle.cs
index acd34c27b..35f532a74 100644
--- a/src/DevBetterWeb.Core/Interfaces/IHandle.cs
+++ b/src/DevBetterWeb.Core/Interfaces/IHandle.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core.Events;
 using DevBetterWeb.Core.SharedKernel;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.Core.Interfaces;
 
diff --git a/src/DevBetterWeb.Core/SharedKernel/BaseDomainEvent.cs b/src/DevBetterWeb.Core/SharedKernel/BaseDomainEvent.cs
index 7b6f79e5e..a7901fb28 100644
--- a/src/DevBetterWeb.Core/SharedKernel/BaseDomainEvent.cs
+++ b/src/DevBetterWeb.Core/SharedKernel/BaseDomainEvent.cs
@@ -1,5 +1,5 @@
 using System;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.Core.SharedKernel;
 
diff --git a/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj b/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj
index 5cb794017..e7afcff65 100644
--- a/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj
+++ b/src/DevBetterWeb.Infrastructure/DevBetterWeb.Infrastructure.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" />
     <PackageReference Include="Markdig" />
-    <PackageReference Include="MediatR" />
+    <PackageReference Include="Mediator.Abstractions" />
     <PackageReference Include="NimblePros.Vimeo" />
     <PackageReference Include="Ardalis.EFCore.Extensions" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
diff --git a/src/DevBetterWeb.Infrastructure/DomainEvents/DomainEventHandler.cs b/src/DevBetterWeb.Infrastructure/DomainEvents/DomainEventHandler.cs
index cc259fd09..27d0df500 100644
--- a/src/DevBetterWeb.Infrastructure/DomainEvents/DomainEventHandler.cs
+++ b/src/DevBetterWeb.Infrastructure/DomainEvents/DomainEventHandler.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Core.SharedKernel;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.Infrastructure.DomainEvents;
 
diff --git a/src/DevBetterWeb.Infrastructure/DomainEvents/MediatRDomainEventDispatcher.cs b/src/DevBetterWeb.Infrastructure/DomainEvents/MediatorDomainEventDispatcher.cs
similarity index 79%
rename from src/DevBetterWeb.Infrastructure/DomainEvents/MediatRDomainEventDispatcher.cs
rename to src/DevBetterWeb.Infrastructure/DomainEvents/MediatorDomainEventDispatcher.cs
index 7a25d1133..d65100319 100644
--- a/src/DevBetterWeb.Infrastructure/DomainEvents/MediatRDomainEventDispatcher.cs
+++ b/src/DevBetterWeb.Infrastructure/DomainEvents/MediatorDomainEventDispatcher.cs
@@ -3,17 +3,17 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Core.SharedKernel;
-using MediatR;
+using Mediator;
 using Microsoft.Extensions.Logging;
 
 namespace DevBetterWeb.Infrastructure.DomainEvents;
 
-public class MediatRDomainEventDispatcher : IDomainEventDispatcher
+public class MediatorDomainEventDispatcher : IDomainEventDispatcher
 {
 	private readonly IMediator _mediator;
-	private readonly ILogger<MediatRDomainEventDispatcher> _logger;
+	private readonly ILogger<MediatorDomainEventDispatcher> _logger;
 
-	public MediatRDomainEventDispatcher(IMediator mediator, ILogger<MediatRDomainEventDispatcher> logger)
+	public MediatorDomainEventDispatcher(IMediator mediator, ILogger<MediatorDomainEventDispatcher> logger)
 	{
 		_mediator = mediator;
 		_logger = logger;
diff --git a/src/DevBetterWeb.Infrastructure/Handlers/DiscordLogVideoAddedHandler.cs b/src/DevBetterWeb.Infrastructure/Handlers/DiscordLogVideoAddedHandler.cs
index 07d1011e9..8319fccaa 100644
--- a/src/DevBetterWeb.Infrastructure/Handlers/DiscordLogVideoAddedHandler.cs
+++ b/src/DevBetterWeb.Infrastructure/Handlers/DiscordLogVideoAddedHandler.cs
@@ -3,7 +3,7 @@
 using DevBetterWeb.Core.Events;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.DiscordWebooks;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.Core.Handlers;
 
diff --git a/src/DevBetterWeb.Infrastructure/InfrastructureServiceCollectionExtensions.cs b/src/DevBetterWeb.Infrastructure/InfrastructureServiceCollectionExtensions.cs
index fefa61fc8..268d010a0 100644
--- a/src/DevBetterWeb.Infrastructure/InfrastructureServiceCollectionExtensions.cs
+++ b/src/DevBetterWeb.Infrastructure/InfrastructureServiceCollectionExtensions.cs
@@ -30,7 +30,7 @@ public static IServiceCollection AddInfrastructureServices(this IServiceCollecti
 		}
 
 		// Common Dependencies
-		services.AddScoped<IDomainEventDispatcher,MediatRDomainEventDispatcher>();
+		services.AddScoped<IDomainEventDispatcher, MediatorDomainEventDispatcher>();
 //		services.AddScoped<IDomainEventDispatcher>(sp => sp.GetRequiredService<DomainEventDispatcher>());
 
 		services.AddScoped<IMemberRegistrationService, MemberRegistrationService>();
diff --git a/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserEmailConfirmationService.cs b/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserEmailConfirmationService.cs
index 9f70054a4..a3c8019c7 100644
--- a/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserEmailConfirmationService.cs
+++ b/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserEmailConfirmationService.cs
@@ -3,7 +3,7 @@
 using DevBetterWeb.Core.Exceptions;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserRoleMembershipService.cs b/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserRoleMembershipService.cs
index c84ddf615..e5404e8fc 100644
--- a/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserRoleMembershipService.cs
+++ b/src/DevBetterWeb.Infrastructure/Services/AspNetCoreIdentityUserRoleMembershipService.cs
@@ -3,7 +3,7 @@
 using DevBetterWeb.Core.Exceptions;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
index 71c430989..c78b688c2 100644
--- a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
+++ b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
@@ -6,7 +6,7 @@
 using DevBetterWeb.Core.Events;
 using DevBetterWeb.Infrastructure.DomainEvents;
 using DevBetterWeb.Infrastructure.Identity.Data;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
diff --git a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/NewMemberRegister.cshtml.cs b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/NewMemberRegister.cshtml.cs
index 0804e6845..570e8882a 100644
--- a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/NewMemberRegister.cshtml.cs
+++ b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/NewMemberRegister.cshtml.cs
@@ -8,7 +8,7 @@
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
 using GoogleReCaptcha.V3.Interface;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/Register.cshtml.cs b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/Register.cshtml.cs
index f6568d85c..c92bf0418 100644
--- a/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/src/DevBetterWeb.Web/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -6,7 +6,7 @@
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Infrastructure.Identity.Data;
 using GoogleReCaptcha.V3.Interface;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/DevBetterWeb.Web/Controllers/HomeController.cs b/src/DevBetterWeb.Web/Controllers/HomeController.cs
index 8467693cf..3aeb7ef13 100644
--- a/src/DevBetterWeb.Web/Controllers/HomeController.cs
+++ b/src/DevBetterWeb.Web/Controllers/HomeController.cs
@@ -1,5 +1,5 @@
 using DevBetterWeb.Core.Events;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
diff --git a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
index 6844fd9ea..6d2cce3e8 100644
--- a/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
+++ b/src/DevBetterWeb.Web/DevBetterWeb.Web.csproj
@@ -21,7 +21,8 @@
 		<PackageReference Include="CSharpFunctionalExtensions" />
 		<PackageReference Include="Dapper" />
 		<PackageReference Include="GoogleReCaptcha.V3" />
-		<PackageReference Include="MediatR" />
+		<PackageReference Include="Mediator.Abstractions" />
+		<PackageReference Include="Mediator.SourceGenerator" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" />
 		<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" />
diff --git a/src/DevBetterWeb.Web/Pages/User/MyProfile/EditAvatar.cshtml.cs b/src/DevBetterWeb.Web/Pages/User/MyProfile/EditAvatar.cshtml.cs
index 519e451c8..6d9516194 100644
--- a/src/DevBetterWeb.Web/Pages/User/MyProfile/EditAvatar.cshtml.cs
+++ b/src/DevBetterWeb.Web/Pages/User/MyProfile/EditAvatar.cshtml.cs
@@ -9,7 +9,7 @@
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Core.Specs;
 using DevBetterWeb.Infrastructure.Identity.Data;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
diff --git a/src/DevBetterWeb.Web/Program.cs b/src/DevBetterWeb.Web/Program.cs
index b9d78115d..8d378e5d4 100644
--- a/src/DevBetterWeb.Web/Program.cs
+++ b/src/DevBetterWeb.Web/Program.cs
@@ -91,11 +91,15 @@
 
 builder.Services.AddInfrastructureServices(isDevelopment, vimeoToken);
 
-builder.Services.AddMediatR(cfg =>
-	cfg.RegisterServicesFromAssemblies(
-		typeof(IAggregateRoot).Assembly,
-		typeof(AppDbContext).Assembly,
-		typeof(Program).Assembly));
+builder.Services.AddMediator(options =>
+{
+	options.Assemblies =
+	[
+		typeof(IAggregateRoot),
+		typeof(AppDbContext),
+		typeof(Program)
+	];
+});
 
 builder.Services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>));
 
diff --git a/src/DevBetterWeb.Web/Services/DailyCheckService.cs b/src/DevBetterWeb.Web/Services/DailyCheckService.cs
index 02255333c..e86faf8b1 100644
--- a/src/DevBetterWeb.Web/Services/DailyCheckService.cs
+++ b/src/DevBetterWeb.Web/Services/DailyCheckService.cs
@@ -5,7 +5,7 @@
 using DevBetterWeb.Core.Events;
 using DevBetterWeb.Core.Interfaces;
 using DevBetterWeb.Core.Specs;
-using MediatR;
+using Mediator;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/DevBetterWeb.Web/Services/StartupNotificationService.cs b/src/DevBetterWeb.Web/Services/StartupNotificationService.cs
index ba4572f62..ae61f23a5 100644
--- a/src/DevBetterWeb.Web/Services/StartupNotificationService.cs
+++ b/src/DevBetterWeb.Web/Services/StartupNotificationService.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using DevBetterWeb.Core.Events;
 using DevBetterWeb.Core.Interfaces;
-using MediatR;
+using Mediator;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/tests/DevBetterWeb.FunctionalTests/CustomWebApplicationFactory.cs b/tests/DevBetterWeb.FunctionalTests/CustomWebApplicationFactory.cs
index 5ff01e736..affa95645 100644
--- a/tests/DevBetterWeb.FunctionalTests/CustomWebApplicationFactory.cs
+++ b/tests/DevBetterWeb.FunctionalTests/CustomWebApplicationFactory.cs
@@ -6,7 +6,7 @@
 using DevBetterWeb.Web;
 using DevBetterWeb.Web.Areas.Identity;
 using DevBetterWeb.Web.Models;
-using MediatR;
+using Mediator;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc.Testing;
diff --git a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj
index b207585a6..1053489e5 100644
--- a/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj
+++ b/tests/DevBetterWeb.FunctionalTests/DevBetterWeb.FunctionalTests.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MediatR" />
+        <PackageReference Include="Mediator.Abstractions" />
         <PackageReference Include="Microsoft.Extensions.Identity.Core" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="xunit" />
diff --git a/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs b/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
index 4d443090f..79e38f58d 100644
--- a/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
+++ b/tests/DevBetterWeb.FunctionalTests/NoOpMediator.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MediatR;
+using Mediator;
 
 namespace DevBetterWeb.FunctionalTests;