diff --git a/src/LiteCharmsSecurity.Admin.Api/Program.cs b/src/LiteCharmsSecurity.Admin.Api/Program.cs
index ea59554..4cd43f9 100644
--- a/src/LiteCharmsSecurity.Admin.Api/Program.cs
+++ b/src/LiteCharmsSecurity.Admin.Api/Program.cs
@@ -24,6 +24,11 @@ namespace LiteCharmsSecurity.Admin.Api
 
         public static async Task Main(string[] args)
         {
+            // Force EF Core to globally ignore the Model Drift warning at the AppDomain level
+            AppContext.SetSwitch("Microsoft.EntityFrameworkCore.Issue34300", true);
+            // OR if using standard diagnostics suppression:
+            System.Environment.SetEnvironmentVariable("EF_CORE_SUPPRESS_PENDING_MODEL_CHANGES_WARNING", "true");
+
             var configuration = GetConfiguration(args);
 
             Log.Logger = new LoggerConfiguration()
diff --git a/src/LiteCharmsSecurity.Admin.Api/Startup.cs b/src/LiteCharmsSecurity.Admin.Api/Startup.cs
index d66a694..15d6eca 100644
--- a/src/LiteCharmsSecurity.Admin.Api/Startup.cs
+++ b/src/LiteCharmsSecurity.Admin.Api/Startup.cs
@@ -111,13 +111,6 @@ namespace LiteCharmsSecurity.Admin.Api
             DatabaseMigrationsConfiguration databaseMigration)
         {
             services.AddDbContexts<AdminIdentityDbContext, IdentityServerConfigurationDbContext, IdentityServerPersistedGrantDbContext, AdminLogDbContext, AdminAuditLogDbContext, IdentityServerDataProtectionDbContext, AdminConfigurationDbContext, AuditLog>(Configuration, databaseMigration);
-
-            // 2. Intercept the DbContextOptions configurations in the DI container and inject the ignore rule
-            services.Configure<DbContextOptionsBuilder<AdminIdentityDbContext>>(options =>
-                options.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning)));
-
-            services.Configure<DbContextOptionsBuilder<IdentityServerConfigurationDbContext>>(options =>
-                options.ConfigureWarnings(w => w.Ignore(RelationalEventId.PendingModelChangesWarning)));
         }
 
         public virtual void RegisterAuthentication(IServiceCollection services)