diff --git a/src/Squidex/Config/Domain/AssetServices.cs b/src/Squidex/Config/Domain/AssetServices.cs
index 669cd29b8..63f813aa6 100644
--- a/src/Squidex/Config/Domain/AssetServices.cs
+++ b/src/Squidex/Config/Domain/AssetServices.cs
@@ -32,14 +32,14 @@ namespace Squidex.Config.Domain
                     var path = config.GetRequiredValue("assetStore:folder:path");
 
                     services.AddSingletonAs(c => new FolderAssetStore(path, c.GetRequiredService<ISemanticLog>()))
-                        .AsOptional<IAssetStore>();
+                        .As<IAssetStore>();
                 },
                 ["GoogleCloud"] = () =>
                 {
                     var bucketName = config.GetRequiredValue("assetStore:googleCloud:bucket");
 
                     services.AddSingletonAs(c => new GoogleCloudAssetStore(bucketName))
-                        .AsOptional<IAssetStore>();
+                        .As<IAssetStore>();
                 },
                 ["AzureBlob"] = () =>
                 {
@@ -47,7 +47,7 @@ namespace Squidex.Config.Domain
                     var containerName = config.GetRequiredValue("assetStore:azureBlob:containerName");
 
                     services.AddSingletonAs(c => new AzureBlobAssetStore(connectionString, containerName))
-                        .AsOptional<IAssetStore>();
+                        .As<IAssetStore>();
                 },
                 ["MongoDb"] = () =>
                 {
@@ -67,7 +67,7 @@ namespace Squidex.Config.Domain
 
                             return new MongoGridFsAssetStore(gridFsbucket);
                         })
-                        .AsOptional<IAssetStore>();
+                        .As<IAssetStore>();
                 }
             });
 
diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs
index ee90b1d47..3f9158605 100644
--- a/src/Squidex/Config/Domain/EventStoreServices.cs
+++ b/src/Squidex/Config/Domain/EventStoreServices.cs
@@ -40,7 +40,7 @@ namespace Squidex.Config.Domain
 
                             return new MongoEventStore(mongDatabase, c.GetRequiredService<IEventNotifier>());
                         })
-                        .AsOptional<IEventStore>();
+                        .As<IEventStore>();
                 },
                 ["CosmosDb"] = () =>
                 {
@@ -56,7 +56,7 @@ namespace Squidex.Config.Domain
                             cosmosDbMasterKey,
                             cosmosDbDatabase,
                             c.GetRequiredService<JsonSerializerSettings>()))
-                        .AsOptional<IEventStore>();
+                        .As<IEventStore>();
 
                     services.AddHealthChecks()
                         .AddCheck<CosmosDbHealthCheck>("CosmosDB", tags: new[] { "node" });
@@ -75,7 +75,7 @@ namespace Squidex.Config.Domain
                             c.GetRequiredService<IJsonSerializer>(),
                             eventStorePrefix,
                             eventStoreProjectionHost))
-                        .AsOptional<IEventStore>();
+                        .As<IEventStore>();
 
                     services.AddHealthChecks()
                         .AddCheck<GetEventStoreHealthCheck>("EventStore", tags: new[] { "node" });
diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs
index 9b7f5e8de..96b775fa0 100644
--- a/src/Squidex/Config/Domain/StoreServices.cs
+++ b/src/Squidex/Config/Domain/StoreServices.cs
@@ -83,24 +83,24 @@ namespace Squidex.Config.Domain
                         .AddCheck<MongoDBHealthCheck>("MongoDB", tags: new[] { "node" });
 
                     services.AddSingletonAs<MongoUsageRepository>()
-                        .AsOptional<IUsageRepository>();
+                        .As<IUsageRepository>();
 
                     services.AddSingletonAs<MongoRuleEventRepository>()
-                        .AsOptional<IRuleEventRepository>();
+                        .As<IRuleEventRepository>();
 
                     services.AddSingletonAs<MongoHistoryEventRepository>()
-                        .AsOptional<IHistoryEventRepository>();
+                        .As<IHistoryEventRepository>();
 
                     services.AddSingletonAs<MongoRoleStore>()
-                        .AsOptional<IRoleStore<IdentityRole>>();
+                        .As<IRoleStore<IdentityRole>>();
 
                     services.AddSingletonAs<MongoUserStore>()
-                        .AsOptional<IUserStore<IdentityUser>>()
-                        .AsOptional<IUserFactory>();
+                        .As<IUserStore<IdentityUser>>()
+                        .As<IUserFactory>();
 
                     services.AddSingletonAs<MongoAssetRepository>()
-                        .AsOptional<IAssetRepository>()
-                        .AsOptional<ISnapshotStore<AssetState, Guid>>();
+                        .As<IAssetRepository>()
+                        .As<ISnapshotStore<AssetState, Guid>>();
 
                     services.AddSingletonAs(c => new MongoContentRepository(
                             c.GetRequiredService<IMongoClient>().GetDatabase(mongoContentDatabaseName),
@@ -108,9 +108,9 @@ namespace Squidex.Config.Domain
                             c.GetRequiredService<IJsonSerializer>(),
                             c.GetRequiredService<ITextIndexer>(),
                             c.GetRequiredService<TypeNameRegistry>()))
-                        .AsOptional<IContentRepository>()
-                        .AsOptional<ISnapshotStore<ContentState, Guid>>()
-                        .AsOptional<IEventConsumer>();
+                        .As<IContentRepository>()
+                        .As<ISnapshotStore<ContentState, Guid>>()
+                        .As<IEventConsumer>();
 
                     var registration = services.FirstOrDefault(x => x.ServiceType == typeof(IPersistedGrantStore));