diff --git a/EnvelopeGenerator.Infrastructure.Notification/Configuration/ConsumerType.cs b/EnvelopeGenerator.Infrastructure.Notification/Configuration/ConsumerType.cs
new file mode 100644
index 00000000..6eb103d6
--- /dev/null
+++ b/EnvelopeGenerator.Infrastructure.Notification/Configuration/ConsumerType.cs
@@ -0,0 +1,7 @@
+namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
+
+public enum ConsumerType
+{
+    API,
+    RabbitMQ
+}
diff --git a/EnvelopeGenerator.Infrastructure.Notification/Configuration/NotificationOptions.cs b/EnvelopeGenerator.Infrastructure.Notification/Configuration/NotificationOptions.cs
new file mode 100644
index 00000000..208cb43f
--- /dev/null
+++ b/EnvelopeGenerator.Infrastructure.Notification/Configuration/NotificationOptions.cs
@@ -0,0 +1,16 @@
+using DigitalData.MessagingService.RabbitMQ;
+
+namespace EnvelopeGenerator.Infrastructure.Notification.Configuration;
+
+public class NotificationOptions
+{
+    public const string SectionName = "Notification";
+
+    public ConsumerType ConsumerType { get; set; }
+
+    public string? ApiUrl { get; set; }
+
+    public string SenderEmail { get; set; } = null!;
+
+    public RabbitMqConnectionConfiguration? RabbitMQ { get; set; }
+}
diff --git a/EnvelopeGenerator.Infrastructure.Notification/DependencyInjection.cs b/EnvelopeGenerator.Infrastructure.Notification/DependencyInjection.cs
index c84c778e..5eb1ff0b 100644
--- a/EnvelopeGenerator.Infrastructure.Notification/DependencyInjection.cs
+++ b/EnvelopeGenerator.Infrastructure.Notification/DependencyInjection.cs
@@ -1,41 +1,47 @@
 using DigitalData.MessagingService.Client;
-using DigitalData.MessagingService.Domain.Entities;
-using DigitalData.MessagingService.RabbitMQ;
 using EnvelopeGenerator.Application.Common.Interfaces.Services.Notification;
+using EnvelopeGenerator.Infrastructure.Notification.Configuration;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace EnvelopeGenerator.Infrastructure.Notification;
 
 public static class DependencyInjection
 {
-    public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration)
+    public static IServiceCollection AddNotificationInfrastructure(this IServiceCollection services, IConfiguration configuration, string sectionName = NotificationOptions.SectionName)
     {
-        var rMqConfig = configuration.GetSection("RabbitMQ").Get<RabbitMqConfiguration>()
-            ?? throw new ArgumentNullException(nameof(RabbitMqConfiguration), "RabbitMQ configuration is missing");
+        var ntfConfiguration = configuration.GetSection(sectionName);
+        services.Configure<NotificationOptions>(ntfConfiguration);
 
-        EmailSender.ConnectRabbitMq(config =>
+        var options = ntfConfiguration.Get<NotificationOptions>()
+            ?? throw new InvalidOperationException(
+                $"Failed to bind configuration section '{sectionName}' to {nameof(NotificationOptions)}. Ensure the section exists and is correctly configured.");
+
+        switch (options.ConsumerType)
         {
-            config.HostName = rMqConfig.HostName;
-            config.Port = rMqConfig.Port;
-            config.UserName = rMqConfig.UserName;
-            config.Password = rMqConfig.Password;
-
-            config.VirtualHost = "/";
-            config.QueueName = "emailprofiler.email.outbox";
-            config.ExchangeName = "emailprofiler.emails";
-            config.RoutingKey = "email.outbox";
-            config.DlqQueueName = "emailprofiler.email.outbox.dlq";
-            config.DlqExchangeName = "emailprofiler.emails.dlq";
-            config.DlqRoutingKey = "email.outbox.dlq";
-        });
-        
-        services.Configure<EmailAccount>(configuration.GetSection("NotificationEmailAccount"));
+            case ConsumerType.API:
+                if (options.ApiUrl is string apiUrl)
+                    services.AddMessagingServiceHttpClient(opt =>
+                    {
+                        opt.BaseAddress = new Uri(apiUrl);
+                        // Additional configuration for the MessagingServiceHttpClient can be added here if needed
+                    });
+                else
+                    throw new InvalidOperationException(
+                        $"MessagingServiceApiUrl must be provided when ClientType is set to Api in the '{sectionName}' configuration section.");
+                break;
+            case ConsumerType.RabbitMQ:
+                if(options.RabbitMQ is not null)
+                    services.AddMessagingServiceClient(ntfConfiguration, nameof(options.RabbitMQ));
+                else
+                    throw new InvalidOperationException(
+                        $"Missing RabbitMQ connection configuration." +
+                        $"When ClientType is set to RabbitMQ, a valid RabbitMQ configuration must be provided in the '{sectionName}' configuration section.");
+                break;
+            default:
+                throw new InvalidOperationException(
+                    $"Unsupported ConsumerType '{options.ConsumerType}' in the '{sectionName}' configuration section.");
+        }
 
         services.AddScoped<IEnvelopeNotificationService, EnvelopeNotificationService>();
         return services;
diff --git a/EnvelopeGenerator.Infrastructure.Notification/EnvelopeGenerator.Infrastructure.Notification.csproj b/EnvelopeGenerator.Infrastructure.Notification/EnvelopeGenerator.Infrastructure.Notification.csproj
index 469d3e1b..1bbaa52e 100644
--- a/EnvelopeGenerator.Infrastructure.Notification/EnvelopeGenerator.Infrastructure.Notification.csproj
+++ b/EnvelopeGenerator.Infrastructure.Notification/EnvelopeGenerator.Infrastructure.Notification.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.MessagingService.Client" Version="1.0.5" />
+    <PackageReference Include="DigitalData.MessagingService.Client" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
   </ItemGroup>