diff --git a/.ci/compose.test.postgres.yml b/.ci/compose.test.postgres.yml
index cb7a8cadc6..6028dd6d96 100644
--- a/.ci/compose.test.postgres.yml
+++ b/.ci/compose.test.postgres.yml
@@ -27,6 +27,8 @@ services:
     command: psql -h postgres -U postgres -d enmeshed -f /app/sql-scripts/setup.sql
 
   admin-cli:
+    volumes:
+      - ./appsettings.override.postgres.docker.json:/app/appsettings.override.json
     environment:
       Database__Provider: Postgres
       Database__ConnectionString: "Server=postgres;Database=enmeshed;User Id=devices;Password=Passw0rd;Port=5432"
diff --git a/.ci/compose.test.sqlserver.yml b/.ci/compose.test.sqlserver.yml
index 69082e7ce8..79c75585b7 100644
--- a/.ci/compose.test.sqlserver.yml
+++ b/.ci/compose.test.sqlserver.yml
@@ -26,6 +26,8 @@ services:
     command: bash -c " sleep 20 && /opt/mssql-tools/bin/sqlcmd -S sqlserver -U SA -P Passw0rd -i /app/sql-scripts/setup.sql"
 
   admin-cli:
+    volumes:
+      - ./appsettings.override.sqlserver.docker.json:/app/appsettings.override.json
     environment:
       Database__Provider: SqlServer
       Database__ConnectionString: "Server=sqlserver;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True"
diff --git a/.run/Admin API.run.xml b/.run/Admin API.run.xml
index e5676cafa5..46022b177e 100644
--- a/.run/Admin API.run.xml	
+++ b/.run/Admin API.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Admin API" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Applications/AdminApi/src/AdminApi/AdminApi.csproj"/>
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Applications/AdminApi/src/AdminApi/AdminApi.csproj" />
+      <option name="LAUNCH_PROFILE_TFM" value="net9.0" />
     <option name="LAUNCH_PROFILE_NAME" value="Default" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/.run/Consumer API.run.xml b/.run/Consumer API.run.xml
index 6abb4686fe..d0bc9d3ff9 100644
--- a/.run/Consumer API.run.xml	
+++ b/.run/Consumer API.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Consumer API" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
-      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Applications/ConsumerApi/src/ConsumerApi.csproj"/>
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0" />
+      <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/Applications/ConsumerApi/src/ConsumerApi.csproj" />
+      <option name="LAUNCH_PROFILE_TFM" value="net9.0" />
     <option name="LAUNCH_PROFILE_NAME" value="Default" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/Applications/AdminApi/src/AdminApi/AdminApi.csproj b/Applications/AdminApi/src/AdminApi/AdminApi.csproj
index ec32bf7b60..1b941334ff 100644
--- a/Applications/AdminApi/src/AdminApi/AdminApi.csproj
+++ b/Applications/AdminApi/src/AdminApi/AdminApi.csproj
@@ -7,7 +7,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.OData" Version="9.2.0" />
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
-        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.0" />
+        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.1" />
         <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
         <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0" />
         <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="9.0.2" />
diff --git a/Applications/AdminCli/src/AdminCli/AdminCli.csproj b/Applications/AdminCli/src/AdminCli/AdminCli.csproj
index be12fe5d50..4001d5b5b5 100644
--- a/Applications/AdminCli/src/AdminCli/AdminCli.csproj
+++ b/Applications/AdminCli/src/AdminCli/AdminCli.csproj
@@ -10,11 +10,30 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\..\..\Infrastructure\Infrastructure.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.Application\Announcements.Application.csproj" />
+        <ProjectReference Include="..\..\..\..\Modules\Announcements\src\Announcements.Infrastructure\Announcements.Infrastructure.csproj" />
         <ProjectReference Include="..\..\..\..\Modules\Devices\src\Devices.Infrastructure\Devices.Infrastructure.csproj" />
     </ItemGroup>
 
+    <Target Name="PreBuild" BeforeTargets="BeforeBuild" Condition="$(Configuration) == Debug">
+        <Delete Files="$(ProjectDir)appsettings.override.json" />
+        <Copy SourceFiles="..\..\..\..\appsettings.override.json" DestinationFolder="$(ProjectDir)" UseHardlinksIfPossible="true" />
+    </Target>
+
+    <ItemGroup>
+        <Content Include="appsettings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+
+        <Content Include="appsettings.override.json" Condition="$(Configuration) == Debug">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
+
 </Project>
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Announcements/AnnouncementCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Announcements/AnnouncementCommand.cs
new file mode 100644
index 0000000000..f8c48a29ac
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/Commands/Announcements/AnnouncementCommand.cs
@@ -0,0 +1,11 @@
+using System.CommandLine;
+
+namespace Backbone.AdminCli.Commands.Announcements;
+
+public class AnnouncementCommand : Command
+{
+    public AnnouncementCommand(SendAnnouncementCommand sendAnnouncementCommand) : base("announcement")
+    {
+        AddCommand(sendAnnouncementCommand);
+    }
+}
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Announcements/SendAnnouncementCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Announcements/SendAnnouncementCommand.cs
new file mode 100644
index 0000000000..048af62e1f
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/Commands/Announcements/SendAnnouncementCommand.cs
@@ -0,0 +1,152 @@
+using System.CommandLine;
+using System.Text.Json;
+using Backbone.AdminCli.Commands.BaseClasses;
+using Backbone.Modules.Announcements.Application.Announcements.Commands.CreateAnnouncement;
+using Backbone.Modules.Announcements.Domain.Entities;
+using MediatR;
+
+namespace Backbone.AdminCli.Commands.Announcements;
+
+public class SendAnnouncementCommand : AdminCliCommand
+{
+    public SendAnnouncementCommand(IMediator mediator) : base(mediator, "send")
+    {
+        var expiresAt = new Option<string?>("--expiration")
+        {
+            IsRequired = false,
+            Description = "The expiration date of the announcement."
+        };
+
+        var severity = new Option<string?>("--severity")
+        {
+            IsRequired = true,
+            Description = "The severity of the announcement. Possible values: Low, Medium, High"
+        };
+
+        AddOption(expiresAt);
+        AddOption(severity);
+
+        this.SetHandler(SendAnnouncement, severity, expiresAt);
+    }
+
+    private async Task SendAnnouncement(string? severityInput, string? expiresAtInput)
+    {
+        try
+        {
+            var severity = severityInput switch
+            {
+                _ when Enum.TryParse<AnnouncementSeverity>(severityInput, ignoreCase: true, out var parsedSeverity) => parsedSeverity,
+                _ => throw new ArgumentException($@"Specified severity '{severityInput}' is not a valid severity.")
+            };
+
+            DateTime? expiresAt = expiresAtInput switch
+            {
+                _ when string.IsNullOrWhiteSpace(expiresAtInput) => null,
+                _ when DateTime.TryParse(expiresAtInput, out var parsedDateTime) => parsedDateTime,
+                _ => throw new ArgumentException($@"Specified expiration datetime '{expiresAtInput}' is not a valid DateTime.")
+            };
+
+            var texts = ReadTextsFromCommandLineInput();
+
+            if (texts.Count == 0)
+            {
+                Console.WriteLine(@"No texts provided. Exiting...");
+                return;
+            }
+
+            Console.WriteLine(@"You entered the following texts:");
+            Console.WriteLine(JsonSerializer.Serialize(texts, JSON_SERIALIZER_OPTIONS));
+            if (!PromptForConfirmation(@"Do you want to proceed?")) return;
+
+            Console.WriteLine(@"Sending announcement...");
+
+            try
+            {
+                var response = await _mediator.Send(new CreateAnnouncementCommand
+                {
+                    Texts = texts,
+                    Severity = severity,
+                    ExpiresAt = expiresAt
+                }, CancellationToken.None);
+
+                Console.WriteLine(@"Announcement sent successfully");
+                Console.WriteLine(JsonSerializer.Serialize(response, JSON_SERIALIZER_OPTIONS));
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($@"An error occurred: {e.Message}");
+        }
+    }
+
+    private static List<CreateAnnouncementCommandText> ReadTextsFromCommandLineInput()
+    {
+        var texts = new List<CreateAnnouncementCommandText>();
+
+        var englishTitle = PromptForInput(@"Enter english title: ");
+        var englishBody = PromptForInput(@"Enter english body: ");
+
+        if (englishTitle == null || englishBody == null) return texts;
+
+        texts.Add(new CreateAnnouncementCommandText
+        {
+            Language = "en",
+            Title = englishTitle,
+            Body = englishBody
+        });
+
+        while (PromptForConfirmation(@"Do you want to add another language?"))
+        {
+            var language = PromptForInput(@"Enter a two-letter language code (e.g. de, it, nl): ");
+            var title = PromptForInput(@"Enter title: ");
+            var body = PromptForInput(@"Enter body: ");
+
+            if (language == null || title == null || body == null)
+            {
+                break;
+            }
+
+            texts.Add(new CreateAnnouncementCommandText
+            {
+                Language = language,
+                Title = title,
+                Body = body
+            });
+        }
+
+        return texts;
+    }
+
+    private static string? PromptForInput(string prompt, bool allowEmpty = false)
+    {
+        Console.Write(prompt);
+        var input = Console.ReadLine();
+
+        while (!allowEmpty && string.IsNullOrWhiteSpace(input))
+        {
+            Console.WriteLine(@"Input cannot be empty. Press x to exit.");
+            Console.Write(prompt);
+            input = Console.ReadLine();
+
+            if (string.IsNullOrWhiteSpace(input))
+                continue;
+            if (input.Trim().Equals("x", StringComparison.CurrentCultureIgnoreCase))
+                return null;
+
+            break;
+        }
+
+        return input;
+    }
+
+    private static bool PromptForConfirmation(string prompt)
+    {
+        var input = PromptForInput($"{prompt} ([y]es/[N]o): ", true);
+        return input?.Trim().ToLower() is "yes" or "y";
+    }
+}
diff --git a/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliCommand.cs
index 6751a1a961..41e7d964de 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliCommand.cs
@@ -1,17 +1,18 @@
 using System.CommandLine;
 using System.Text.Json;
+using MediatR;
 
 namespace Backbone.AdminCli.Commands.BaseClasses;
 
 public abstract class AdminCliCommand : Command
 {
+    protected readonly IMediator _mediator;
+
     protected static readonly JsonSerializerOptions JSON_SERIALIZER_OPTIONS =
         new() { WriteIndented = true, PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
 
-    protected readonly ServiceLocator _serviceLocator;
-
-    protected AdminCliCommand(string name, ServiceLocator serviceLocator, string? description = null) : base(name, description)
+    protected AdminCliCommand(IMediator mediator, string name, string? description = null) : base(name, description)
     {
-        _serviceLocator = serviceLocator;
+        _mediator = mediator;
     }
 }
diff --git a/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs
deleted file mode 100644
index ae1fa9b198..0000000000
--- a/Applications/AdminCli/src/AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using System.CommandLine;
-using Backbone.Tooling.Extensions;
-
-namespace Backbone.AdminCli.Commands.BaseClasses;
-
-public abstract class AdminCliDbCommand : AdminCliCommand
-{
-    protected static readonly Option<string> DB_CONNECTION_STRING_OPTION =
-        new("-c", "The connection string to the database.");
-
-    protected static readonly Option<string> DB_PROVIDER_OPTION =
-        new("-p", "The database provider. Possible values: Postgres, SqlServer");
-
-    protected AdminCliDbCommand(string name, ServiceLocator serviceLocator, string? description = null) : base(name, serviceLocator, description)
-    {
-        AddOption(DB_PROVIDER_OPTION);
-        AddOption(DB_CONNECTION_STRING_OPTION);
-    }
-
-    static AdminCliDbCommand()
-    {
-        DB_PROVIDER_OPTION.AddAlias("--dbProvider");
-        DB_PROVIDER_OPTION.SetDefaultValueFactory(GetDbProviderFromEnvVar);
-        DB_PROVIDER_OPTION.AddValidator(result => { result.ErrorMessage = ValidateProvider(result.GetValueOrDefault<string>()); });
-
-        DB_CONNECTION_STRING_OPTION.AddAlias("--dbConnectionString");
-        DB_CONNECTION_STRING_OPTION.SetDefaultValueFactory(GetDbConnectionStringFromEnvVar);
-        DB_CONNECTION_STRING_OPTION.AddValidator(result => { result.ErrorMessage = ValidateDbConnectionString(result.GetValueOrDefault<string>()); });
-    }
-
-    private static string? GetDbProviderFromEnvVar()
-    {
-        var provider = Environment.GetEnvironmentVariable("Database__Provider");
-
-        if (provider.IsNullOrEmpty())
-            provider = Environment.GetEnvironmentVariable("Database:Provider");
-
-        return provider;
-    }
-
-    private static string? GetDbConnectionStringFromEnvVar()
-    {
-        var connectionString = Environment.GetEnvironmentVariable("Database__ConnectionString");
-
-        if (connectionString.IsNullOrEmpty())
-            connectionString = Environment.GetEnvironmentVariable("Database:ConnectionString");
-
-        return connectionString;
-    }
-
-    private static string? ValidateDbConnectionString(string? connectionString)
-    {
-        return connectionString.IsNullOrEmpty()
-            ? "You need to specify a database connection string by passing it via an option (-c/--connectionString) or by setting it via environment variable (Database__ConnectionString/Database:ConnectionString)."
-            : null;
-    }
-
-    private static string? ValidateProvider(string? provider)
-    {
-        return provider.IsNullOrEmpty()
-            ? "You need to specify a database provider by passing it via an option (-p/--provider) or by setting it via environment variable (Database__Provider/Database:Provider)."
-            : null;
-    }
-}
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Clients/ClientCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Clients/ClientCommand.cs
index 67fb140ea1..5674d61877 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Clients/ClientCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Clients/ClientCommand.cs
@@ -1,13 +1,13 @@
-using Backbone.AdminCli.Commands.BaseClasses;
+using System.CommandLine;
 
 namespace Backbone.AdminCli.Commands.Clients;
 
-public class ClientCommand : AdminCliCommand
+public class ClientCommand : Command
 {
-    public ClientCommand(ServiceLocator serviceLocator) : base("client", serviceLocator)
+    public ClientCommand(CreateClientCommand createClientCommand, ListClientsCommand listClientsCommand, DeleteClientsCommand deleteClientsCommand) : base("client")
     {
-        AddCommand(new CreateClientCommand(serviceLocator));
-        AddCommand(new ListClientsCommand(serviceLocator));
-        AddCommand(new DeleteClientsCommand(serviceLocator));
+        AddCommand(createClientCommand);
+        AddCommand(listClientsCommand);
+        AddCommand(deleteClientsCommand);
     }
 }
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Clients/CreateClientCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Clients/CreateClientCommand.cs
index 83483cbdcd..7cc5fdcfea 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Clients/CreateClientCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Clients/CreateClientCommand.cs
@@ -5,9 +5,9 @@
 
 namespace Backbone.AdminCli.Commands.Clients;
 
-public class CreateClientCommand : AdminCliDbCommand
+public class CreateClientCommand : AdminCliCommand
 {
-    public CreateClientCommand(ServiceLocator serviceLocator) : base("create", serviceLocator, "Create an OAuth client")
+    public CreateClientCommand(IMediator mediator) : base(mediator, "create", "Create an OAuth client")
     {
         var clientId = new Option<string>("--clientId")
         {
@@ -44,16 +44,13 @@ public CreateClientCommand(ServiceLocator serviceLocator) : base("create", servi
         AddOption(defaultTierId);
         AddOption(maxIdentities);
 
-        this.SetHandler(CreateClient, DB_PROVIDER_OPTION, DB_CONNECTION_STRING_OPTION, clientId, displayName, clientSecret,
-            defaultTierId, maxIdentities);
+        this.SetHandler(CreateClient, clientId, displayName, clientSecret, defaultTierId, maxIdentities);
     }
 
-    private async Task CreateClient(string dbProvider, string dbConnectionString, string? clientId,
+    private async Task CreateClient(string? clientId,
         string? displayName, string? clientSecret, string defaultTier, int? maxIdentities)
     {
-        var mediator = _serviceLocator.GetService<IMediator>(dbProvider, dbConnectionString);
-
-        var response = await mediator.Send(new Modules.Devices.Application.Clients.Commands.CreateClient.CreateClientCommand(clientId, displayName, clientSecret, defaultTier, maxIdentities),
+        var response = await _mediator.Send(new Modules.Devices.Application.Clients.Commands.CreateClient.CreateClientCommand(clientId, displayName, clientSecret, defaultTier, maxIdentities),
             CancellationToken.None);
 
         Console.WriteLine(JsonSerializer.Serialize(response, JSON_SERIALIZER_OPTIONS));
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Clients/DeleteClientsCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Clients/DeleteClientsCommand.cs
index 94272c0092..65e78ce370 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Clients/DeleteClientsCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Clients/DeleteClientsCommand.cs
@@ -5,9 +5,9 @@
 
 namespace Backbone.AdminCli.Commands.Clients;
 
-public class DeleteClientsCommand : AdminCliDbCommand
+public class DeleteClientsCommand : AdminCliCommand
 {
-    public DeleteClientsCommand(ServiceLocator serviceLocator) : base("delete", serviceLocator, "Deletes the OAuth clients with the given clientId's")
+    public DeleteClientsCommand(IMediator mediator) : base(mediator, "delete", "Deletes the OAuth clients with the given clientId's")
     {
         var clientIds = new Argument<string[]>("clientIds")
         {
@@ -17,18 +17,16 @@ public DeleteClientsCommand(ServiceLocator serviceLocator) : base("delete", serv
 
         AddArgument(clientIds);
 
-        this.SetHandler(DeleteClients, DB_PROVIDER_OPTION, DB_CONNECTION_STRING_OPTION, clientIds);
+        this.SetHandler(DeleteClients, clientIds);
     }
 
-    private async Task DeleteClients(string dbProvider, string dbConnectionString, string[] clientIds)
+    private async Task DeleteClients(string[] clientIds)
     {
-        var mediator = _serviceLocator.GetService<IMediator>(dbProvider, dbConnectionString);
-
         foreach (var clientId in clientIds)
         {
             try
             {
-                await mediator.Send(new DeleteClientCommand(clientId), CancellationToken.None);
+                await _mediator.Send(new DeleteClientCommand(clientId), CancellationToken.None);
                 Console.WriteLine($@"Successfully deleted client '{clientId}'");
             }
             catch (Exception ex)
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Clients/ListClientsCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Clients/ListClientsCommand.cs
index 3fdfa6e70e..d100bdb84a 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Clients/ListClientsCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Clients/ListClientsCommand.cs
@@ -6,18 +6,16 @@
 
 namespace Backbone.AdminCli.Commands.Clients;
 
-public class ListClientsCommand : AdminCliDbCommand
+public class ListClientsCommand : AdminCliCommand
 {
-    public ListClientsCommand(ServiceLocator serviceLocator) : base("list", serviceLocator, "List all existing OAuth clients")
+    public ListClientsCommand(IMediator mediator) : base(mediator, "list", "List all existing OAuth clients")
     {
-        this.SetHandler(ListClients, DB_PROVIDER_OPTION, DB_CONNECTION_STRING_OPTION);
+        this.SetHandler(ListClients);
     }
 
-    private async Task ListClients(string dbProvider, string dbConnectionString)
+    private async Task ListClients()
     {
-        var mediator = _serviceLocator.GetService<IMediator>(dbProvider, dbConnectionString);
-
-        var response = await mediator.Send(new ListClientsQuery(), CancellationToken.None);
+        var response = await _mediator.Send(new ListClientsQuery(), CancellationToken.None);
 
         Console.WriteLine(@"The following clients are configured:");
 
diff --git a/Applications/AdminCli/src/AdminCli/Commands/RootCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/RootCommand.cs
index d0825e13a1..3e9f379075 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/RootCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/RootCommand.cs
@@ -1,3 +1,4 @@
+using Backbone.AdminCli.Commands.Announcements;
 using Backbone.AdminCli.Commands.Clients;
 using Backbone.AdminCli.Commands.Tiers;
 
@@ -5,9 +6,10 @@ namespace Backbone.AdminCli.Commands;
 
 public class RootCommand : System.CommandLine.RootCommand
 {
-    public RootCommand(ServiceLocator serviceLocator)
+    public RootCommand(ClientCommand clientCommand, TierCommand tierCommand, AnnouncementCommand announcementCommand)
     {
-        AddCommand(new ClientCommand(serviceLocator));
-        AddCommand(new TierCommand(serviceLocator));
+        AddCommand(clientCommand);
+        AddCommand(tierCommand);
+        AddCommand(announcementCommand);
     }
 }
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Tiers/ListTiersCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Tiers/ListTiersCommand.cs
index e8d2e4e853..547e5f7e8c 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Tiers/ListTiersCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Tiers/ListTiersCommand.cs
@@ -7,18 +7,16 @@
 
 namespace Backbone.AdminCli.Commands.Tiers;
 
-public class ListTiersCommand : AdminCliDbCommand
+public class ListTiersCommand : AdminCliCommand
 {
-    public ListTiersCommand(ServiceLocator serviceLocator) : base("list", serviceLocator, "List all existing Tiers")
+    public ListTiersCommand(IMediator mediator) : base(mediator, "list", "List all existing Tiers")
     {
-        this.SetHandler(ListTiers, DB_PROVIDER_OPTION, DB_CONNECTION_STRING_OPTION);
+        this.SetHandler(ListTiers);
     }
 
-    private async Task ListTiers(string dbProvider, string dbConnectionString)
+    private async Task ListTiers()
     {
-        var mediator = _serviceLocator.GetService<IMediator>(dbProvider, dbConnectionString);
-
-        var response = await mediator.Send(new ListTiersQuery(new PaginationFilter()), CancellationToken.None);
+        var response = await _mediator.Send(new ListTiersQuery(new PaginationFilter()), CancellationToken.None);
 
         Console.WriteLine(@"The following tiers are configured:");
 
diff --git a/Applications/AdminCli/src/AdminCli/Commands/Tiers/TierCommand.cs b/Applications/AdminCli/src/AdminCli/Commands/Tiers/TierCommand.cs
index 58341252e3..8e816ce22e 100644
--- a/Applications/AdminCli/src/AdminCli/Commands/Tiers/TierCommand.cs
+++ b/Applications/AdminCli/src/AdminCli/Commands/Tiers/TierCommand.cs
@@ -1,11 +1,11 @@
-using Backbone.AdminCli.Commands.BaseClasses;
+using System.CommandLine;
 
 namespace Backbone.AdminCli.Commands.Tiers;
 
-public class TierCommand : AdminCliCommand
+public class TierCommand : Command
 {
-    public TierCommand(ServiceLocator serviceLocator) : base("tier", serviceLocator)
+    public TierCommand(ListTiersCommand listTiersCommand) : base("tier")
     {
-        AddCommand(new ListTiersCommand(serviceLocator));
+        AddCommand(listTiersCommand);
     }
 }
diff --git a/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs b/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs
new file mode 100644
index 0000000000..d2a71fb12f
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/Configuration/AdminCliConfiguration.cs
@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+using Backbone.Infrastructure.EventBus;
+
+namespace Backbone.AdminCli.Configuration;
+
+public class AdminCliConfiguration
+{
+    [Required]
+    public AdminInfrastructureConfiguration Infrastructure { get; set; } = new();
+
+    [Required]
+    public ModulesConfiguration Modules { get; set; } = new();
+
+    public class AdminInfrastructureConfiguration
+    {
+        [Required]
+        public EventBusConfiguration EventBus { get; set; } = new();
+    }
+
+    public class ModulesConfiguration
+    {
+        [Required]
+        public DevicesConfiguration Devices { get; set; } = new();
+    }
+}
diff --git a/Applications/AdminCli/src/AdminCli/Configuration/DevicesConfiguration.cs b/Applications/AdminCli/src/AdminCli/Configuration/DevicesConfiguration.cs
new file mode 100644
index 0000000000..5042d9e103
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/Configuration/DevicesConfiguration.cs
@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using Backbone.Modules.Devices.Infrastructure.PushNotifications;
+
+namespace Backbone.AdminCli.Configuration;
+
+public class DevicesConfiguration
+{
+    [Required]
+    public InfrastructureConfiguration Infrastructure { get; set; } = new();
+
+    public class InfrastructureConfiguration
+    {
+        [Required]
+        public PushNotificationOptions PushNotifications { get; set; } = new();
+    }
+}
diff --git a/Applications/AdminCli/src/AdminCli/Dockerfile b/Applications/AdminCli/src/AdminCli/Dockerfile
index d14e004c5e..b2e76a2e48 100644
--- a/Applications/AdminCli/src/AdminCli/Dockerfile
+++ b/Applications/AdminCli/src/AdminCli/Dockerfile
@@ -18,6 +18,11 @@ COPY ["Modules/Devices/src/Devices.Application/Devices.Application.csproj", "Mod
 COPY ["BuildingBlocks/src/BuildingBlocks.Application/BuildingBlocks.Application.csproj", "BuildingBlocks/src/BuildingBlocks.Application/"]
 COPY ["BuildingBlocks/src/Crypto/Crypto.csproj", "BuildingBlocks/src/Crypto/"]
 COPY ["Modules/Devices/src/Devices.Domain/Devices.Domain.csproj", "Modules/Devices/src/Devices.Domain/"]
+COPY ["Modules/Announcements/src/Announcements.Application/Announcements.Application.csproj", "Modules/Announcements/src/Announcements.Application/"]
+COPY ["Modules/Announcements/src/Announcements.Infrastructure/Announcements.Infrastructure.csproj", "Modules/Announcements/src/Announcements.Infrastructure/"]
+COPY ["Modules/Announcements/src/Announcements.Domain/Announcements.Domain.csproj", "Modules/Announcements/src/Announcements.Domain/"]
+COPY ["Infrastructure/Infrastructure.csproj", "Infrastructure/"]
+
 
 RUN dotnet restore /p:ContinuousIntegrationBuild=true "Applications/AdminCli/src/AdminCli/AdminCli.csproj"
 
@@ -32,6 +37,9 @@ FROM base AS final
 WORKDIR /app
 COPY --from=build /app/publish/Backbone.AdminCli ./backbone
 
+# Test
+COPY Applications/AdminCli/src/AdminCli/appsettings.json .
+
 ENV PATH="$PATH:/app"
 
 LABEL org.opencontainers.image.source="https://github.com/nmshd/backbone"
diff --git a/Applications/AdminCli/src/AdminCli/IServiceCollectionExtensions.cs b/Applications/AdminCli/src/AdminCli/IServiceCollectionExtensions.cs
new file mode 100644
index 0000000000..7edf4bb57a
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/IServiceCollectionExtensions.cs
@@ -0,0 +1,59 @@
+using System.CommandLine;
+using Backbone.AdminCli.Configuration;
+using Backbone.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Infrastructure.PushNotifications;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+
+namespace Backbone.AdminCli;
+
+public static class IServiceCollectionExtensions
+{
+    public static void AddCliCommands(this IServiceCollection services)
+    {
+        var commands = typeof(Program)
+            .Assembly.GetTypes()
+            .Where(t => t.IsSubclassOf(typeof(Command)) && !t.IsAbstract);
+
+        foreach (var command in commands)
+        {
+            services.AddTransient(command);
+        }
+    }
+
+    public static void AddCommonInfrastructure(this IServiceCollection services)
+    {
+        var serviceProvider = services.BuildServiceProvider();
+#pragma warning disable ASP0000 // We retrieve the Configuration via IOptions here so that it is validated
+        var parsedConfiguration = serviceProvider.GetRequiredService<IOptions<AdminCliConfiguration>>().Value;
+#pragma warning restore ASP0000
+
+        services.AddEventBus(parsedConfiguration.Infrastructure.EventBus);
+        services.AddPushNotifications(parsedConfiguration.Modules.Devices.Infrastructure.PushNotifications);
+    }
+
+    public static IServiceCollection AddDevicesModule(this IServiceCollection services, IConfiguration configuration)
+    {
+        Modules.Devices.Application.Extensions.IServiceCollectionExtensions.AddApplication(services, configuration.GetSection("Modules:Devices:Application"));
+        Modules.Devices.Infrastructure.Persistence.IServiceCollectionExtensions.AddDatabase(services, options =>
+        {
+            options.Provider = configuration["Modules:Devices:Infrastructure:SqlDatabase:Provider"]!;
+            options.ConnectionString = configuration["Modules:Devices:Infrastructure:SqlDatabase:ConnectionString"]!;
+        });
+
+        return services;
+    }
+
+    public static IServiceCollection AddAnnouncementsModule(this IServiceCollection services, IConfiguration configuration)
+    {
+        Modules.Announcements.Application.Extensions.IServiceCollectionExtensions.AddApplication(services);
+        Modules.Announcements.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
+        {
+            options.Provider = configuration["Modules:Devices:Infrastructure:SqlDatabase:Provider"]!;
+            options.ConnectionString = configuration["Modules:Devices:Infrastructure:SqlDatabase:ConnectionString"]!;
+        });
+
+        return services;
+    }
+}
diff --git a/Applications/AdminCli/src/AdminCli/Program.cs b/Applications/AdminCli/src/AdminCli/Program.cs
index f149b995c3..200bd29a03 100644
--- a/Applications/AdminCli/src/AdminCli/Program.cs
+++ b/Applications/AdminCli/src/AdminCli/Program.cs
@@ -1,4 +1,14 @@
 using System.CommandLine;
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+using Backbone.AdminCli.Configuration;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.Modules.Devices.Domain.Entities.Identities;
+using Backbone.Modules.Devices.Infrastructure.OpenIddict;
+using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using RootCommand = Backbone.AdminCli.Commands.RootCommand;
 
 namespace Backbone.AdminCli;
@@ -7,6 +17,54 @@ public class Program
 {
     private static async Task Main(string[] args)
     {
-        await new RootCommand(new ServiceLocator()).InvokeAsync(args);
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: false)
+            .AddJsonFile("appsettings.override.json", optional: true, reloadOnChange: false)
+            .Build();
+
+        var serviceProvider = BuildServiceProvider(configuration);
+
+        var rootCommand = serviceProvider.GetRequiredService<RootCommand>();
+
+        await rootCommand.InvokeAsync(args);
+    }
+
+    private static IServiceProvider BuildServiceProvider(IConfiguration configuration)
+    {
+        var services = new ServiceCollection();
+
+        services.AddSingleton(configuration);
+        services.ConfigureAndValidate<AdminCliConfiguration>(configuration.Bind);
+
+        services.AddAutofac();
+        services.AddLogging();
+
+        services.AddCliCommands();
+
+        services
+            .AddIdentity<ApplicationUser, IdentityRole>()
+            .AddEntityFrameworkStores<DevicesDbContext>();
+
+        services
+            .AddOpenIddict()
+            .AddCore(options =>
+            {
+                options
+                    .UseEntityFrameworkCore()
+                    .UseDbContext<DevicesDbContext>()
+                    .ReplaceDefaultEntities<CustomOpenIddictEntityFrameworkCoreApplication, CustomOpenIddictEntityFrameworkCoreAuthorization, CustomOpenIddictEntityFrameworkCoreScope,
+                        CustomOpenIddictEntityFrameworkCoreToken, string>();
+                options.AddApplicationStore<CustomOpenIddictEntityFrameworkCoreApplicationStore>();
+            });
+
+        services.AddSingleton<IQuotaChecker, AlwaysSuccessQuotaChecker>();
+
+        services
+            .AddAnnouncementsModule(configuration)
+            .AddDevicesModule(configuration);
+
+        var containerBuilder = new ContainerBuilder();
+        containerBuilder.Populate(services);
+        return new AutofacServiceProvider(containerBuilder.Build());
     }
 }
diff --git a/Applications/AdminCli/src/AdminCli/Properties/launchSettings.json b/Applications/AdminCli/src/AdminCli/Properties/launchSettings.json
index c7d0aa16f1..4c0782670f 100644
--- a/Applications/AdminCli/src/AdminCli/Properties/launchSettings.json
+++ b/Applications/AdminCli/src/AdminCli/Properties/launchSettings.json
@@ -1,18 +1,19 @@
 {
-  "profiles": {
-    "Start": {
-      "commandName": "Project",
-      "commandLineArgs": "tier list",
-      // enter an existing command here in order to debug it
-      //"commandLineArgs": "client list", // enter an existing command here in order to debug it
-      //"commandLineArgs": "client create --clientId test --clientSecret test --defaultTier Basic --maxIdentities 100", // enter an existing command here in order to debug it
-      //"commandLineArgs": "client delete test", // enter an existing command here in order to debug it
-      "environmentVariables": {
-        "Database__Provider": "Postgres",
-        //"Database__ConnectionString": "Server=localhost;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True;" //SqlServer
-        "Database__ConnectionString": "User ID=devices;Password=Passw0rd;Server=host.docker.internal;Port=5432;Database=enmeshed;"
-        //Postgres
-      }
+    "profiles": {
+        "Start": {
+            "commandName": "Project",
+            //"commandLineArgs": "tier list",
+            // enter an existing command here in order to debug it
+            //"commandLineArgs": "client list", // enter an existing command here in order to debug it
+            //"commandLineArgs": "client create --clientId test --clientSecret test --defaultTier Basic --maxIdentities 100", // enter an existing command here in order to debug it
+            //"commandLineArgs": "client delete test", // enter an existing command here in order to debug it
+            "commandLineArgs": "announcement send --expiration 2025-12-31 --severity medium",
+            "environmentVariables": {
+                "Database__Provider": "Postgres",
+                //"Database__ConnectionString": "Server=localhost;Database=enmeshed;User Id=devices;Password=Passw0rd;TrustServerCertificate=True;" //SqlServer
+                "Database__ConnectionString": "User ID=postgres;Password=admin;Server=localhost;Port=5432;Database=enmeshed;"
+                //Postgres
+            }
+        }
     }
-  }
 }
diff --git a/Applications/AdminCli/src/AdminCli/ServiceLocator.cs b/Applications/AdminCli/src/AdminCli/ServiceLocator.cs
deleted file mode 100644
index 305e18be69..0000000000
--- a/Applications/AdminCli/src/AdminCli/ServiceLocator.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Backbone.BuildingBlocks.Application.QuotaCheck;
-using Backbone.Modules.Devices.Application.Extensions;
-using Backbone.Modules.Devices.Domain.Entities.Identities;
-using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Backbone.Modules.Devices.Infrastructure.Persistence;
-using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Backbone.AdminCli;
-
-public class ServiceLocator
-{
-    public T GetService<T>(string dbProvider, string dbConnectionString) where T : notnull
-    {
-        var services = ConfigureServices(dbProvider, dbConnectionString);
-
-        var serviceProvider = services.BuildServiceProvider();
-        return serviceProvider.GetRequiredService<T>();
-    }
-
-    private static IServiceCollection ConfigureServices(string dbProvider, string dbConnectionString)
-    {
-        var services = new ServiceCollection();
-        services
-            .AddIdentity<ApplicationUser, IdentityRole>()
-            .AddEntityFrameworkStores<DevicesDbContext>();
-
-        services
-            .AddOpenIddict()
-            .AddCore(options =>
-            {
-                options
-                    .UseEntityFrameworkCore()
-                    .UseDbContext<DevicesDbContext>()
-                    .ReplaceDefaultEntities<CustomOpenIddictEntityFrameworkCoreApplication, CustomOpenIddictEntityFrameworkCoreAuthorization, CustomOpenIddictEntityFrameworkCoreScope,
-                        CustomOpenIddictEntityFrameworkCoreToken, string>();
-                options.AddApplicationStore<CustomOpenIddictEntityFrameworkCoreApplicationStore>();
-            });
-
-        services.AddApplicationWithoutIdentityDeletion();
-
-        services.AddSingleton<IQuotaChecker, AlwaysSuccessQuotaChecker>();
-
-        services.AddLogging();
-        services.AddDatabase(options =>
-        {
-            options.Provider = dbProvider;
-            options.ConnectionString = dbConnectionString;
-        });
-
-        return services;
-    }
-}
diff --git a/Applications/AdminCli/src/AdminCli/appsettings.json b/Applications/AdminCli/src/AdminCli/appsettings.json
new file mode 100644
index 0000000000..91b604ed5f
--- /dev/null
+++ b/Applications/AdminCli/src/AdminCli/appsettings.json
@@ -0,0 +1,7 @@
+{
+    "Infrastructure": {
+        "EventBus": {
+            "SubscriptionClientName": "consumerapi"
+        }
+    }
+}
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
index 32fabb67b9..48f8ce03de 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/BuildingBlocks.Infrastructure.csproj
@@ -2,7 +2,7 @@
 
     <ItemGroup>
         <PackageReference Include="Autofac" Version="8.2.0" />
-        <PackageReference Include="AWSSDK.S3" Version="3.7.415.6" />
+        <PackageReference Include="AWSSDK.S3" Version="3.7.415.7" />
         <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.4" />
         <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
         <PackageReference Include="Google.Cloud.PubSub.V1" Version="3.21.0" />
@@ -18,7 +18,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
         <PackageReference Include="Polly" Version="8.5.2" />
-        <PackageReference Include="RabbitMQ.Client" Version="7.1.0" />
+        <PackageReference Include="RabbitMQ.Client" Version="7.1.1" />
         <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="System.Interactive.Async" Version="6.0.1" />
     </ItemGroup>
diff --git a/Modules/Devices/src/Devices.Application/Devices.Application.csproj b/Modules/Devices/src/Devices.Application/Devices.Application.csproj
index b4ec7537a1..3a14d4c13e 100644
--- a/Modules/Devices/src/Devices.Application/Devices.Application.csproj
+++ b/Modules/Devices/src/Devices.Application/Devices.Application.csproj
@@ -3,8 +3,8 @@
     <ItemGroup>
         <PackageReference Include="FluentValidation" Version="11.11.0" />
         <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
-        <PackageReference Include="OpenIddict.Core" Version="6.1.0" />
-        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.0" />
+        <PackageReference Include="OpenIddict.Core" Version="6.1.1" />
+        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.1" />
         <PackageReference Include="Polly" Version="8.5.2" />
     </ItemGroup>
 
diff --git a/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
index cf5d46ee29..65542569ca 100644
--- a/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
@@ -18,11 +18,6 @@ public static void AddApplication(this IServiceCollection services, IConfigurati
 
         applicationConfiguration.GetSection("IdentityDeletion").Bind(IdentityDeletionConfiguration.Instance);
 
-        services.AddApplicationWithoutIdentityDeletion();
-    }
-
-    public static void AddApplicationWithoutIdentityDeletion(this IServiceCollection services)
-    {
         services.AddMediatR(c => c
             .RegisterServicesFromAssemblyContaining<RegisterDeviceCommand>()
             .AddOpenBehavior(typeof(LoggingBehavior<,>))
diff --git a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
index 5692b75d1b..00b69598ae 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
+++ b/Modules/Devices/src/Devices.Infrastructure/Devices.Infrastructure.csproj
@@ -12,8 +12,8 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.2" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
-        <PackageReference Include="OpenIddict.AspNetCore" Version="6.1.0" />
-        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.0" />
+        <PackageReference Include="OpenIddict.AspNetCore" Version="6.1.1" />
+        <PackageReference Include="OpenIddict.EntityFrameworkCore" Version="6.1.1" />
         <PackageReference Include="Polly" Version="8.5.2" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.2" />
     </ItemGroup>
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationTexts/PushNotificationTextProvider.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationTexts/PushNotificationTextProvider.cs
index b2ab915f23..6227c48c5f 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationTexts/PushNotificationTextProvider.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationTexts/PushNotificationTextProvider.cs
@@ -2,7 +2,6 @@
 using System.Resources;
 using Backbone.BuildingBlocks.Application.PushNotifications;
 using Backbone.Modules.Devices.Domain.Entities.Identities;
-using Backbone.Tooling.Extensions;
 
 namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.NotificationTexts;
 
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/PushNotifications/Connectors/Sse/ServerSentEventsConnectorTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/PushNotifications/Connectors/Sse/ServerSentEventsConnectorTests.cs
index 606740845f..b3e16d4236 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/PushNotifications/Connectors/Sse/ServerSentEventsConnectorTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/PushNotifications/Connectors/Sse/ServerSentEventsConnectorTests.cs
@@ -3,7 +3,6 @@
 using Backbone.Modules.Devices.Infrastructure.PushNotifications.Responses;
 using FakeItEasy;
 using Microsoft.Extensions.Logging;
-using static Backbone.Modules.Devices.Infrastructure.Tests.TestDataGenerator;
 
 namespace Backbone.Modules.Devices.Infrastructure.Tests.Tests.PushNotifications.Connectors.Sse;
 
diff --git a/Modules/Tags/src/Tags.Application/ApplicationOptions.cs b/Modules/Tags/src/Tags.Application/ApplicationOptions.cs
index 11b79eeae0..2db87babef 100644
--- a/Modules/Tags/src/Tags.Application/ApplicationOptions.cs
+++ b/Modules/Tags/src/Tags.Application/ApplicationOptions.cs
@@ -58,19 +58,23 @@ public class ContainsValidTagsAttribute : ValidationAttribute
         return ValidationResult.Success;
     }
 
-    private ValidationResult? ValidateTag(IEnumerable<string> nameParts, TagInfo tag)
+    private ValidationResult? ValidateTag(IEnumerable<string> propertyPath, TagInfo tag)
     {
         var notSupportedLanguages = tag.DisplayNames.Keys.Except(_supportedLanguages).ToList();
         var notImplementedLanguages = _supportedLanguages.Except(tag.DisplayNames.Keys).ToList();
 
         if (notSupportedLanguages.Count != 0)
-            return new ValidationResult($"The languages \"{Enumerate(notSupportedLanguages)}\" are unsupported", [GetPathOfProperty(nameParts)]);
+            return new ValidationResult($"The languages \"{Enumerate(notSupportedLanguages)}\" are unsupported", [GetPathOfProperty(propertyPath)]);
         if (notImplementedLanguages.Count != 0)
-            return new ValidationResult($"A display name for the language(s) \"{Enumerate(notImplementedLanguages)}\" is required.", [GetPathOfProperty(nameParts)]);
+            return new ValidationResult($"A display name for the language(s) \"{Enumerate(notImplementedLanguages)}\" is required.", [GetPathOfProperty(propertyPath)]);
+
+        var tagName = propertyPath.Last();
+        if (propertyPath.Count() == 2 && tagName.Equals("x", StringComparison.OrdinalIgnoreCase))
+            return new ValidationResult("A first-level tag may not be equal to \"x\" or \"X\".", [GetPathOfProperty(propertyPath)]);
 
         foreach (var (childName, child) in tag.Children)
         {
-            var result = ValidateTag(nameParts.Append(childName), child);
+            var result = ValidateTag(propertyPath.Append(childName), child);
             if (result != ValidationResult.Success) return result;
         }
 
diff --git a/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs b/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
index 017d48ffc8..95fefa0780 100644
--- a/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
+++ b/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
@@ -1,4 +1,3 @@
-using System.Text.Json;
 using Backbone.BuildingBlocks.API;
 using Backbone.BuildingBlocks.API.Mvc;
 using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
diff --git a/helm/templates/admincli/deployment.yaml b/helm/templates/admincli/deployment.yaml
index 576626da83..2eca05e186 100644
--- a/helm/templates/admincli/deployment.yaml
+++ b/helm/templates/admincli/deployment.yaml
@@ -30,6 +30,10 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      volumes:
+        - name: settings-override
+          configMap:
+            name: configuration
       containers:
         - name: {{ .Values.admincli.name }}
           {{- with .Values.admincli.securityContext }}
@@ -40,10 +44,28 @@ spec:
             {{- toYaml .Values.admincli.resources | nindent 12 }}
           image: "{{ .Values.admincli.image.repository }}:{{- default .Chart.AppVersion .Values.admincli.image.tagOverride }}"
           imagePullPolicy: {{ .Values.admincli.image.pullPolicy }}
+          volumeMounts:
+            - name: settings-override
+              mountPath: /app/appsettings.override.json
+              subPath: appsettings.override.json
+              readOnly: true
           env:
-            - name: Database__Provider
-              value: {{ .Values.global.configuration.modules.devices.infrastructure.sqlDatabase.provider }}
-            {{- include "generateEnvVars" (list .Values.global.env .Values.admincli.env) | nindent 12 }}
+            {{- if .Values.global.useBuiltInEventbus }}
+            - name: infrastructure__eventBus__vendor
+              value: RabbitMQ
+            - name: infrastructure__eventBus__rabbitMqEnableSsl
+              value: "false"
+            - name: infrastructure__eventBus__connectionInfo
+              value: "rabbitmq"
+            - name: infrastructure__eventBus__rabbitMQUsername
+              value: "admin"
+            - name: infrastructure__eventBus__rabbitMQPassword
+              valueFrom:
+                secretKeyRef:
+                  name: rabbitmq-password
+                  key: "VALUE" 
+            {{- end }}
+            {{- include "generateEnvVars" (list .Values.global.env .Values.consumerapi.env) | nindent 12 }}
           tty: true
           command:
             - /bin/bash