diff --git a/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs b/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
index 50cb7a19d..fff0fe559 100644
--- a/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Runtime/ServiceCollectionExtensions.cs
@@ -1,6 +1,4 @@
-using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Elsa.Runtime
 {
@@ -8,8 +6,9 @@ namespace Elsa.Runtime
     {
         public static IServiceCollection AddStartupRunner(this IServiceCollection services)
         {
-            services.TryAddTransient<IStartupRunner, StartupRunner>();
-            return services;
+            return services
+                .AddTransient<IStartupRunner, StartupRunner>()
+                .AddHostedService<StartupRunnerHostedService>();
         }
 
         public static IServiceCollection AddStartupTask<TStartupTask>(this IServiceCollection services)
@@ -18,15 +17,5 @@ namespace Elsa.Runtime
             return services
                 .AddTransient<IStartupTask, TStartupTask>();
         }
-
-        /// <summary>
-        /// Registers a TaskExecutingServer that automatically invokes <see cref="IStartupRunner"/> when Kestrel starts.
-        /// </summary>
-        public static IServiceCollection AddTaskExecutingServer(this IServiceCollection services)
-        {
-            return services
-                .AddStartupRunner()
-                .AddHostedService<StartupRunnerHostedService>();
-        }
     }
 }
\ No newline at end of file
diff --git a/src/core/Elsa/ElsaServiceCollectionExtensions.cs b/src/core/Elsa/ElsaServiceCollectionExtensions.cs
index d97a9b258..660eb2ad7 100644
--- a/src/core/Elsa/ElsaServiceCollectionExtensions.cs
+++ b/src/core/Elsa/ElsaServiceCollectionExtensions.cs
@@ -3,6 +3,7 @@ using Elsa;
 using Elsa.Activities.ControlFlow.Extensions;
 using Elsa.Activities.UserTask.Extensions;
 using Elsa.Activities.Workflows.Extensions;
+using Elsa.Runtime;
 using Elsa.Scripting.JavaScript.Extensions;
 using Elsa.Scripting.Liquid.Extensions;
 
@@ -17,6 +18,7 @@ namespace Microsoft.Extensions.DependencyInjection
         {
             return services
                 .AddElsaCore(configure)
+                .AddStartupRunner()
                 .AddJavaScriptExpressionEvaluator()
                 .AddLiquidExpressionEvaluator()
                 .AddControlFlowActivities()
diff --git a/src/dashboard/Elsa.Dashboard/Extensions/DashboardServiceCollectionExtensions.cs b/src/dashboard/Elsa.Dashboard/Extensions/DashboardServiceCollectionExtensions.cs
index 81bbf37c0..e84a5dcde 100644
--- a/src/dashboard/Elsa.Dashboard/Extensions/DashboardServiceCollectionExtensions.cs
+++ b/src/dashboard/Elsa.Dashboard/Extensions/DashboardServiceCollectionExtensions.cs
@@ -36,7 +36,6 @@ namespace Elsa.Dashboard.Extensions
                 optionsBuilder.Configure(x => x.DiscoverActivities());
             
             services
-                .AddTaskExecutingServer()
                 .AddTempData();
 
             services.AddMvcCore(
diff --git a/src/samples/Sample07/Startup.cs b/src/samples/Sample07/Startup.cs
index f3391cb08..aa6cb10e8 100644
--- a/src/samples/Sample07/Startup.cs
+++ b/src/samples/Sample07/Startup.cs
@@ -22,7 +22,6 @@ namespace Sample07
         {
             services
                 .AddElsa()
-                .AddTaskExecutingServer()
                 .AddHttpActivities(options => options.Bind(Configuration.GetSection("Http")))
                 .AddEmailActivities(options => options.Bind(Configuration.GetSection("Smtp")))
                 .AddTimerActivities(options => options.Bind(Configuration.GetSection("BackgroundRunner")))
diff --git a/src/samples/Sample08/Startup.cs b/src/samples/Sample08/Startup.cs
index e3223f439..9f9502666 100644
--- a/src/samples/Sample08/Startup.cs
+++ b/src/samples/Sample08/Startup.cs
@@ -26,7 +26,6 @@ namespace Sample08
         {
             services
                 .AddElsa()
-                .AddTaskExecutingServer()
                 .AddHttpActivities()
                 .AddTimerActivities(options => options.Configure(x => x.SweepInterval = Duration.FromSeconds(10)))
                 .AddEmailActivities(options => options.Bind(Configuration.GetSection("Smtp")))
diff --git a/src/samples/Sample21/Startup.cs b/src/samples/Sample21/Startup.cs
index 6a684d7e5..f5691b1d7 100644
--- a/src/samples/Sample21/Startup.cs
+++ b/src/samples/Sample21/Startup.cs
@@ -44,7 +44,6 @@ namespace Sample21
 
             services
                 .AddElsa()
-                .AddTaskExecutingServer()
                 .AddHttpActivities()
                 .AddTimerActivities(options => options.Configure(x => x.SweepInterval = Duration.FromSeconds(10)))
                 .AddEmailActivities(options => options.Bind(Configuration.GetSection("Smtp")))