diff --git a/CleanArchitecture.Api/appsettings.Development.json b/CleanArchitecture.Api/appsettings.Development.json
index 75fd869..ad995f1 100644
--- a/CleanArchitecture.Api/appsettings.Development.json
+++ b/CleanArchitecture.Api/appsettings.Development.json
@@ -19,6 +19,6 @@
     "Port": 5672,
     "Username": "guest",
     "Password": "guest",
-    "Enabled": "True"
+    "Enabled": "False"
   }
 }
diff --git a/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainEventConfiguration.cs b/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainEventConfiguration.cs
index 4347992..cd7d376 100644
--- a/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainEventConfiguration.cs
+++ b/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainEventConfiguration.cs
@@ -20,6 +20,6 @@ public sealed class StoredDomainEventConfiguration : IEntityTypeConfiguration<St
 
         builder.Property(c => c.User)
             .HasMaxLength(100)
-            .HasColumnType("nvarchar(100)");
+            .HasColumnType("varchar(100)");
     }
 }
\ No newline at end of file
diff --git a/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainNotificationConfiguration.cs b/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainNotificationConfiguration.cs
index 45cd02a..8386e01 100644
--- a/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainNotificationConfiguration.cs
+++ b/CleanArchitecture.Infrastructure/Configurations/EventSourcing/StoredDomainNotificationConfiguration.cs
@@ -32,7 +32,7 @@ public sealed class StoredDomainNotificationConfiguration : IEntityTypeConfigura
 
         builder.Property(c => c.CorrelationId)
             .HasMaxLength(100)
-            .HasColumnType("nvarchar(100)");
+            .HasColumnType("varchar(100)");
 
         builder.Ignore(c => c.Data);
 
diff --git a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.Designer.cs b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.Designer.cs
similarity index 96%
rename from CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.Designer.cs
rename to CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.Designer.cs
index 65fa4fe..1bb5f2b 100644
--- a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.Designer.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.Designer.cs
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
 {
     [DbContext(typeof(DomainNotificationStoreDbContext))]
-    [Migration("20240816164320_AddDomainNotificationStore")]
+    [Migration("20240816181502_AddDomainNotificationStore")]
     partial class AddDomainNotificationStore
     {
         /// <inheritdoc />
@@ -42,7 +42,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
                     b.Property<string>("CorrelationId")
                         .IsRequired()
                         .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasColumnType("varchar(100)");
 
                     b.Property<string>("Key")
                         .IsRequired()
diff --git a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.cs b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.cs
similarity index 97%
rename from CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.cs
rename to CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.cs
index 710767d..3997013 100644
--- a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816164320_AddDomainNotificationStore.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/20240816181502_AddDomainNotificationStore.cs
@@ -18,7 +18,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
                     Id = table.Column<Guid>(type: "uuid", nullable: false),
                     Data = table.Column<string>(type: "text", nullable: false),
                     User = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
-                    CorrelationId = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                    CorrelationId = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: false),
                     AggregateId = table.Column<Guid>(type: "uuid", nullable: false),
                     MessageType = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
                     Timestamp = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
diff --git a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/DomainNotificationStoreDbContextModelSnapshot.cs b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/DomainNotificationStoreDbContextModelSnapshot.cs
index af2ae7e..333b331 100644
--- a/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/DomainNotificationStoreDbContextModelSnapshot.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/DomainNotificationStoreDb/DomainNotificationStoreDbContextModelSnapshot.cs
@@ -39,7 +39,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.DomainNotificationStoreDb
                     b.Property<string>("CorrelationId")
                         .IsRequired()
                         .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasColumnType("varchar(100)");
 
                     b.Property<string>("Key")
                         .IsRequired()
diff --git a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.Designer.cs b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.Designer.cs
similarity index 95%
rename from CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.Designer.cs
rename to CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.Designer.cs
index ec857a4..129fde0 100644
--- a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.Designer.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.Designer.cs
@@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
 {
     [DbContext(typeof(EventStoreDbContext))]
-    [Migration("20240816164232_AddEventStore")]
+    [Migration("20240816181514_AddEventStore")]
     partial class AddEventStore
     {
         /// <inheritdoc />
@@ -55,7 +55,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
                     b.Property<string>("User")
                         .IsRequired()
                         .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasColumnType("varchar(100)");
 
                     b.HasKey("Id");
 
diff --git a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.cs b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.cs
similarity index 93%
rename from CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.cs
rename to CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.cs
index c696763..d916dbd 100644
--- a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816164232_AddEventStore.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/20240816181514_AddEventStore.cs
@@ -17,7 +17,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
                 {
                     Id = table.Column<Guid>(type: "uuid", nullable: false),
                     Data = table.Column<string>(type: "text", nullable: false),
-                    User = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: false),
+                    User = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: false),
                     CorrelationId = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: false),
                     AggregateId = table.Column<Guid>(type: "uuid", nullable: false),
                     Action = table.Column<string>(type: "varchar(100)", nullable: false),
diff --git a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/EventStoreDbContextModelSnapshot.cs b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/EventStoreDbContextModelSnapshot.cs
index 3145046..115549e 100644
--- a/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/EventStoreDbContextModelSnapshot.cs
+++ b/CleanArchitecture.Infrastructure/Migrations/EventStoreDb/EventStoreDbContextModelSnapshot.cs
@@ -52,7 +52,7 @@ namespace CleanArchitecture.Infrastructure.Migrations.EventStoreDb
                     b.Property<string>("User")
                         .IsRequired()
                         .HasMaxLength(100)
-                        .HasColumnType("nvarchar(100)");
+                        .HasColumnType("varchar(100)");
 
                     b.HasKey("Id");
 
diff --git a/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs b/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs
index 58ba32a..b762b01 100644
--- a/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs
+++ b/CleanArchitecture.IntegrationTests/GlobalSetupFixture.cs
@@ -38,7 +38,7 @@ internal class GlobalSetupFixture
 
         DatabaseConnectionString = DatabaseContainer
             .GetConnectionString()
-            .Replace("Database=master", $"Database=clean-architecture-{Guid.NewGuid()}");
+            .Replace("Database=postgres", $"Database=clean-architecture-{Guid.NewGuid()}");
     }
 
     [OneTimeTearDown]