diff --git a/API/Program.cs b/API/Program.cs
index e3d8cae60..aa6c98e56 100644
--- a/API/Program.cs
+++ b/API/Program.cs
@@ -43,10 +43,8 @@ namespace API
                 logger.LogError(ex, "An error occurred during migration");
             }
             
-            // Load all tasks from DI (TODO: This is not working - WarmupServicesStartupTask is Null)
+            // Load all tasks from DI and initialize them (TODO: This is not working - WarmupServicesStartupTask is Null)
             var startupTasks = host.Services.GetServices<WarmupServicesStartupTask>();
-            
-            // Execute all the tasks
             foreach (var startupTask in startupTasks)
             {
                 await startupTask.ExecuteAsync();
diff --git a/API/Startup.cs b/API/Startup.cs
index 2174e5ed2..c9a6a8eca 100644
--- a/API/Startup.cs
+++ b/API/Startup.cs
@@ -1,8 +1,8 @@
 using System;
 using System.IO.Compression;
 using System.Linq;
-using API.Data;
 using API.Extensions;
+using API.Interfaces.Services;
 using API.Middleware;
 using API.Services;
 using Hangfire;
@@ -18,9 +18,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
-using IApplicationLifetime = Microsoft.AspNetCore.Hosting.IApplicationLifetime;
 
 namespace API
 {
@@ -85,10 +83,8 @@ namespace API
             // Add the processing server as IHostedService
             services.AddHangfireServer();
             
-
-            // services
-            //     .AddStartupTask<WarmupServicesStartupTask>()
-            //     //.TryAddSingleton(services);
+            //services.AddStartupTask<WarmupServicesStartupTask>(services).
+            services.AddTransient<IStartupTask, WarmupServicesStartupTask>().TryAddSingleton(services);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.