diff --git a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
index 3b02c2c8..51871730 100644
--- a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
+++ b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -8,6 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Quartz.AspNetCore" Version="3.15.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
diff --git a/EnvelopeGenerator.Finalizer/Program.cs b/EnvelopeGenerator.Finalizer/Program.cs
index 2a96f47d..12950b50 100644
--- a/EnvelopeGenerator.Finalizer/Program.cs
+++ b/EnvelopeGenerator.Finalizer/Program.cs
@@ -5,8 +5,8 @@ using EnvelopeGenerator.Finalizer.Models;
 using EnvelopeGenerator.Infrastructure;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
 using Quartz;
+using Quartz.AspNetCore;
 using Serilog;
 
 // Load Serilog from appsettings.json
@@ -43,10 +43,10 @@ try
     builder.Services.AddSwaggerGen();
     #endregion
 
-    #region Worker
+    #region AQuartz
     builder.Services.AddQuartz(q =>
     {
-        var name = $"{typeof(Worker).FullName}-{Guid.NewGuid():N}";
+        var name = $"{typeof(Worker).FullName}";
         var jobKey = new JobKey(name);
         q.AddJob<Worker>(opts => opts.WithIdentity(jobKey));
 
@@ -63,9 +63,9 @@ try
             .WithCronSchedule(expression));
     });
 
-    builder.Services.AddQuartzHostedService(opt =>
+    builder.Services.AddQuartzServer(options =>
     {
-        opt.WaitForJobsToComplete = true;
+        options.WaitForJobsToComplete = true;
     });
     #endregion
 
diff --git a/EnvelopeGenerator.Finalizer/Properties/launchSettings.json b/EnvelopeGenerator.Finalizer/Properties/launchSettings.json
index 7a34a9db..2e144339 100644
--- a/EnvelopeGenerator.Finalizer/Properties/launchSettings.json
+++ b/EnvelopeGenerator.Finalizer/Properties/launchSettings.json
@@ -22,8 +22,8 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
-      "launchUrl": "swagger",
+      "launchBrowser": true,
+      "launchUrl": "quartz",
       "applicationUrl": "https://localhost:7141;http://localhost:5010",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"