diff --git a/src/Squidex/Config/Startup/RebuilderHost.cs b/src/Squidex/Config/Startup/MigrationRebuilderHost.cs
similarity index 82%
rename from src/Squidex/Config/Startup/RebuilderHost.cs
rename to src/Squidex/Config/Startup/MigrationRebuilderHost.cs
index 55877619b..8a1c84ea0 100644
--- a/src/Squidex/Config/Startup/RebuilderHost.cs
+++ b/src/Squidex/Config/Startup/MigrationRebuilderHost.cs
@@ -13,11 +13,11 @@ using Squidex.Infrastructure.Log;
 
 namespace Squidex.Config.Startup
 {
-    public sealed class RebuilderHost : SafeHostedService
+    public sealed class MigrationRebuilderHost : SafeHostedService
     {
         private readonly RebuildRunner rebuildRunner;
 
-        public RebuilderHost(IApplicationLifetime lifetime, ISemanticLog log, RebuildRunner rebuildRunner)
+        public MigrationRebuilderHost(IApplicationLifetime lifetime, ISemanticLog log, RebuildRunner rebuildRunner)
             : base(lifetime, log)
         {
             this.rebuildRunner = rebuildRunner;
diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs
index 29a9c580f..6bc48e67d 100644
--- a/src/Squidex/WebStartup.cs
+++ b/src/Squidex/WebStartup.cs
@@ -109,8 +109,8 @@ namespace Squidex
             services.AddOrleans(config, environment);
 
             services.AddHostedService<MigratorHost>();
+            services.AddHostedService<MigrationRebuilderHost>();
             services.AddHostedService<BackgroundHost>();
-            services.AddHostedService<RebuilderHost>();
 
             return services.BuildServiceProvider();
         }