diff --git a/src/dotnet/QuantEngine.Web/Program.cs b/src/dotnet/QuantEngine.Web/Program.cs
index bc18b02..448ef59 100644
--- a/src/dotnet/QuantEngine.Web/Program.cs
+++ b/src/dotnet/QuantEngine.Web/Program.cs
@@ -23,7 +23,6 @@ using Microsoft.Extensions.Options;
 using MudBlazor.Services;
 using QuantEngine.Web.Services;
 using Hangfire;
-using Hangfire.SqlServer;
 
 // Serilog Configuration with Telegram Sink
 Log.Logger = new LoggerConfiguration()
diff --git a/src/dotnet/QuantEngine.Web/QuantEngine.Web.csproj b/src/dotnet/QuantEngine.Web/QuantEngine.Web.csproj
index a33be43..83f52ca 100644
--- a/src/dotnet/QuantEngine.Web/QuantEngine.Web.csproj
+++ b/src/dotnet/QuantEngine.Web/QuantEngine.Web.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Hangfire.AspNetCore" Version="1.8.23" />
     <PackageReference Include="Hangfire.Core" Version="1.8.23" />
-    <PackageReference Include="Hangfire.SqlServer" Version="1.8.23" />
+    <PackageReference Include="Hangfire.PostgreSql" Version="1.20.10" />
     <PackageReference Include="MudBlazor" Version="8.6.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.0-preview.2.25120.18" />
diff --git a/src/dotnet/QuantEngine.Web/Services/SchedulerService.cs b/src/dotnet/QuantEngine.Web/Services/SchedulerService.cs
index ee9cd20..56c40ba 100644
--- a/src/dotnet/QuantEngine.Web/Services/SchedulerService.cs
+++ b/src/dotnet/QuantEngine.Web/Services/SchedulerService.cs
@@ -1,7 +1,7 @@
 using Hangfire;
 using Hangfire.States;
 using Hangfire.Dashboard;
-using Hangfire.SqlServer;
+using Hangfire.PostgreSql;
 using System.Linq.Expressions;
 using QuantEngine.Application.Services;
 using QuantEngine.Infrastructure.Data;
@@ -238,12 +238,10 @@ public static class HangfireServiceExtensions
             .SetDataCompatibilityLevel(CompatibilityLevel.Version_180)
             .UseSimpleAssemblyNameTypeSerializer()
             .UseRecommendedSerializerSettings()
-            .UseSqlServerStorage(connectionString, new SqlServerStorageOptions
+            .UsePostgreSqlStorage(options => options.UseNpgsqlConnection(connectionString), new PostgreSqlStorageOptions
             {
-                CommandBatchMaxTimeout = TimeSpan.FromMinutes(5),
-                SlidingInvisibilityTimeout = TimeSpan.FromMinutes(5),
                 QueuePollInterval = TimeSpan.FromSeconds(15),
-                DisableGlobalLocks = true
+                PrepareSchemaIfNecessary = true
             }));
 
         // Add Hangfire server