diff --git a/Dockerfile.runtime b/Dockerfile.runtime
index 547ad3cb3d..76d6152d87 100644
--- a/Dockerfile.runtime
+++ b/Dockerfile.runtime
@@ -28,8 +28,7 @@ VOLUME ["/config", "/cache", "/media"]
 
 ENV JELLYFIN_DATA_DIR=/config \
     JELLYFIN_CACHE_DIR=/cache \
-    JELLYFIN_LOG_DIR=/config/log \
-    JELLYFIN_CONFIG_DIR=/config
+    JELLYFIN_LOG_DIR=/config/log
 
 ENTRYPOINT ["./jellyfin", \
             "--datadir", "/config", \
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 93f71fdc69..b38e3cc82d 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -285,6 +285,10 @@ namespace Jellyfin.Server
                 .AddJellyfinDbContext(startupConfigurationManager, startupConfig)
                 .AddSingleton<IApplicationPaths>(appPaths)
                 .AddSingleton<ServerApplicationPaths>(appPaths)
+                // Required by NpgsqlDataSource factory in AddJellyfinDbContext when
+                // DatabaseType=Jellyfin-PostgreSQL — the factory resolves this from DI
+                // to read CustomProviderOptions and pool settings.
+                .AddSingleton<IServerConfigurationManager>(startupConfigurationManager)
                 .RegisterStartupLogger();
 
             migrationStartupServiceProvider.AddSingleton(migrationStartupServiceProvider);