diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs
index eb5c8065f..be1309092 100644
--- a/src/Squidex/Config/Domain/StoreServices.cs
+++ b/src/Squidex/Config/Domain/StoreServices.cs
@@ -65,8 +65,11 @@ namespace Squidex.Config.Domain
                     services.AddSingletonAs<MongoMigrationStatus>()
                         .As<IMigrationStatus>();
 
-                    services.AddSingletonAs<MongoPersistedGrantStore>()
-                        .As<IPersistedGrantStore>();
+                    services.AddTransientAs<ConvertOldSnapshotStores>()
+                        .As<IMigration>();
+
+                    services.AddTransientAs(c => new DeleteContentCollections(mongoContentDatabase))
+                        .As<IMigration>();
 
                     services.AddSingletonAs<MongoUsageRepository>()
                         .As<IUsageRepository>();
@@ -74,12 +77,15 @@ namespace Squidex.Config.Domain
                     services.AddSingletonAs<MongoRuleEventRepository>()
                         .As<IRuleEventRepository>();
 
-                    services.AddSingletonAs<MongoRoleStore>()
-                        .As<IRoleStore<IdentityRole>>();
-
                     services.AddSingletonAs<MongoHistoryEventRepository>()
                         .As<IHistoryEventRepository>();
 
+                    services.AddSingletonAs<MongoPersistedGrantStore>()
+                        .As<IPersistedGrantStore>();
+
+                    services.AddSingletonAs<MongoRoleStore>()
+                        .As<IRoleStore<IdentityRole>>();
+
                     services.AddSingletonAs<MongoUserStore>()
                         .As<IUserStore<IdentityUser>>()
                         .As<IUserFactory>();
@@ -92,12 +98,6 @@ namespace Squidex.Config.Domain
                         .As<IContentRepository>()
                         .As<ISnapshotStore<ContentState, Guid>>()
                         .As<IEventConsumer>();
-
-                    services.AddTransientAs<ConvertOldSnapshotStores>()
-                        .As<IMigration>();
-
-                    services.AddTransientAs(c => new DeleteContentCollections(mongoContentDatabase))
-                        .As<IMigration>();
                 }
             });