diff --git a/src/NzbDrone.Core/Datastore/PostgresOptions.cs b/src/NzbDrone.Core/Datastore/PostgresOptions.cs
index abe568381..0c65a4b39 100644
--- a/src/NzbDrone.Core/Datastore/PostgresOptions.cs
+++ b/src/NzbDrone.Core/Datastore/PostgresOptions.cs
@@ -14,11 +14,11 @@ public class PostgresOptions
         public static PostgresOptions GetOptions()
         {
             var config = new ConfigurationBuilder()
-                .AddEnvironmentVariables("Radarr__")
+                .AddEnvironmentVariables()
                 .Build();
 
             var postgresOptions = new PostgresOptions();
-            config.GetSection("Postgres").Bind(postgresOptions);
+            config.GetSection("Radarr:Postgres").Bind(postgresOptions);
 
             return postgresOptions;
         }
diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
index 4de62925a..38c15ab86 100644
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -8,8 +8,6 @@
 using System.Text;
 using DryIoc;
 using DryIoc.Microsoft.DependencyInjection;
-using FluentMigrator.Runner.Processors.Postgres;
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,7 +15,6 @@
 using Microsoft.Extensions.Hosting.WindowsServices;
 using NLog;
 using NzbDrone.Common.Composition.Extensions;
-using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Extensions;
@@ -135,7 +132,7 @@ public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContex
                 })
                 .ConfigureServices(services =>
                 {
-                    services.Configure<PostgresOptions>(config.GetSection("Postgres"));
+                    services.Configure<PostgresOptions>(config.GetSection("Radarr:Postgres"));
                 })
                 .ConfigureWebHost(builder =>
                 {
@@ -207,7 +204,7 @@ private static IConfiguration GetConfiguration(StartupContext context)
             return new ConfigurationBuilder()
                 .AddXmlFile(appFolder.GetConfigPath(), optional: true, reloadOnChange: false)
                 .AddInMemoryCollection(new List<KeyValuePair<string, string>> { new ("dataProtectionFolder", appFolder.GetDataProtectionPath()) })
-                .AddEnvironmentVariables("Radarr__")
+                .AddEnvironmentVariables()
                 .Build();
         }