diff --git a/EnvelopeGenerator.Finalizer/Extensions.cs b/EnvelopeGenerator.Finalizer/Extensions.cs
index 49c29e88..5c0af349 100644
--- a/EnvelopeGenerator.Finalizer/Extensions.cs
+++ b/EnvelopeGenerator.Finalizer/Extensions.cs
@@ -23,12 +23,12 @@ public static class Extensions
         IConfiguration configuration)
         where TJob : IJob
     {
-        var expression = configuration[$"{nameof(TJob)}:CronExpression"];
+        var expression = configuration[$"{typeof(TJob).Name}:CronExpression"];
         if (string.IsNullOrWhiteSpace(expression))
             throw new InvalidOperationException(
                 "Cron expression for the Worker job is not configured. " +
                 "Please provide a valid cron schedule in the configuration under " +
-                $"'{nameof(TJob)}:CronExpression'.");
+                $"'{typeof(TJob).FullName}:CronExpression'.");
 
         return q.ScheduleJobDefault<TJob>(expression);
     }
diff --git a/EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApi.cs b/EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApiJob.cs
similarity index 71%
rename from EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApi.cs
rename to EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApiJob.cs
index 2f335f87..193b59e5 100644
--- a/EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApi.cs
+++ b/EnvelopeGenerator.Finalizer/Job/EnvelopeTaskApiJob.cs
@@ -2,11 +2,11 @@ using Quartz;
 
 namespace EnvelopeGenerator.Finalizer.Job
 {
-    public class EnvelopeTaskApi : IJob
+    public class EnvelopeTaskApiJob : IJob
     {
-        private readonly ILogger<EnvelopeTaskApi> _logger;
+        private readonly ILogger<EnvelopeTaskApiJob> _logger;
 
-        public EnvelopeTaskApi(ILogger<EnvelopeTaskApi> logger)
+        public EnvelopeTaskApiJob(ILogger<EnvelopeTaskApiJob> logger)
         {
             _logger = logger;
         }
diff --git a/EnvelopeGenerator.Finalizer/Program.cs b/EnvelopeGenerator.Finalizer/Program.cs
index 17131ca0..ce9355df 100644
--- a/EnvelopeGenerator.Finalizer/Program.cs
+++ b/EnvelopeGenerator.Finalizer/Program.cs
@@ -1,6 +1,7 @@
 using CommandDotNet.Execution;
 using EnvelopeGenerator.Application.ThirdPartyModules.Queries;
 using EnvelopeGenerator.DependencyInjection;
+using EnvelopeGenerator.Finalizer;
 using EnvelopeGenerator.Finalizer.Job;
 using EnvelopeGenerator.Finalizer.Models;
 using EnvelopeGenerator.Infrastructure;
@@ -49,21 +50,8 @@ try
     #region Quartz
     builder.Services.AddQuartz(q =>
     {
-        var name = $"{typeof(FinishEnvelopeJob).FullName}";
-        var jobKey = new JobKey(name);
-        q.AddJob<FinishEnvelopeJob>(opts => opts.WithIdentity(jobKey));
-
-        var expression = config[nameof(FinishEnvelopeJob) + ":CronExpression"];
-        if (string.IsNullOrWhiteSpace(expression))
-            throw new InvalidOperationException(
-             "Cron expression for the Worker job is not configured. " +
-             "Please provide a valid cron schedule in the configuration under " +
-             $"'{nameof(FinishEnvelopeJob)}:CronExpression'.");
-
-        q.AddTrigger(opts => opts
-            .ForJob(jobKey)
-            .WithIdentity(name + "-trigger")
-            .WithCronSchedule(expression));
+        q.ScheduleJobDefault<FinishEnvelopeJob>(config);
+        q.ScheduleJobDefault<EnvelopeTaskApiJob>(config);
     });
 
     builder.Services.AddQuartzServer(options =>
diff --git a/EnvelopeGenerator.Finalizer/appsettings.Job.json b/EnvelopeGenerator.Finalizer/appsettings.Job.json
index 7290cf84..45e1fd34 100644
--- a/EnvelopeGenerator.Finalizer/appsettings.Job.json
+++ b/EnvelopeGenerator.Finalizer/appsettings.Job.json
@@ -1,5 +1,8 @@
 {
   "FinishEnvelopeJob": {
     "CronExpression": "* * * * * ?"
+  },
+  "EnvelopeTaskApiJob": {
+    "CronExpression": "* * * * * ?"
   }
 }
\ No newline at end of file