diff --git a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/Infrastructure.cs b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/Infrastructure.cs
index 45e547ac8..8e2dd1519 100644
--- a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/Infrastructure.cs
+++ b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/Infrastructure.cs
@@ -6,23 +6,11 @@ namespace Elsa.Workflows.ComponentTests.Fixtures;
 
 public class Infrastructure : IAsyncLifetime
 {
-    // public readonly PostgreSqlContainer DbContainer = new PostgreSqlBuilder()
-    //     .WithImage("postgres:16-alpine")
-    //     .WithDatabase("elsa")
-    //     .WithUsername("postgres")
-    //     .WithPassword("postgres")
-    //     .WithCommand(
-    //         "-c", "max_connections=100",
-    //         "-c", "shared_buffers=128MB",
-    //         "-c", "work_mem=4MB",
-    //         "-c", "effective_cache_size=256MB"
-    //     )
-    //     .Build();
+    public readonly PostgreSqlContainer DbContainer = new PostgreSqlBuilder().Build();
 
-    public readonly MsSqlContainer DbContainer = new MsSqlBuilder()
-        .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
-        .WithPassword("!Elsa2025@")
-        .Build();
+    // public readonly MsSqlContainer DbContainer = new MsSqlBuilder()
+    //     .WithImage("mcr.microsoft.com/mssql/server:2022-latest")
+    //     .Build();
 
     public readonly RabbitMqContainer RabbitMqContainer = new RabbitMqBuilder()
         .WithImage("rabbitmq:4-management")
diff --git a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
index 1a10ecba1..c07fcc0f9 100644
--- a/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
+++ b/test/component/Elsa.Workflows.ComponentTests/Helpers/Fixtures/WorkflowServer.cs
@@ -80,15 +80,15 @@ public class WorkflowServer(Infrastructure infrastructure, string url) : WebAppl
                 });
                 elsa.UseIdentity(identity => identity.UseEntityFrameworkCore(ef =>
                 {
-                    //ef.UsePostgreSql(dbConnectionString);
-                    ef.UseSqlServer(dbConnectionString);
+                    ef.UsePostgreSql(dbConnectionString);
+                    //ef.UseSqlServer(dbConnectionString);
                 }));
                 elsa.UseWorkflowManagement(management =>
                 {
                     management.UseEntityFrameworkCore(ef =>
                     {
-                        //ef.UsePostgreSql(dbConnectionString);
-                        ef.UseSqlServer(dbConnectionString);
+                        ef.UsePostgreSql(dbConnectionString);
+                        //ef.UseSqlServer(dbConnectionString);
                     });
                     management.UseCache();
                 });
@@ -96,8 +96,8 @@ public class WorkflowServer(Infrastructure infrastructure, string url) : WebAppl
                 {
                     runtime.UseEntityFrameworkCore(ef =>
                     {
-                        //ef.UsePostgreSql(dbConnectionString);
-                        ef.UseSqlServer(dbConnectionString);
+                        ef.UsePostgreSql(dbConnectionString);
+                        //ef.UseSqlServer(dbConnectionString);
                     });
                     runtime.UseCache();
                     runtime.UseDistributedRuntime();
@@ -114,8 +114,8 @@ public class WorkflowServer(Infrastructure infrastructure, string url) : WebAppl
                 {
                     alterations.UseEntityFrameworkCore(ef =>
                     {
-                        //ef.UsePostgreSql(dbConnectionString);
-                        ef.UseSqlServer(dbConnectionString);
+                        ef.UsePostgreSql(dbConnectionString);
+                        //ef.UseSqlServer(dbConnectionString);
                     });
                 });
                 elsa.UseHttp(http =>