diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index 2c34e04de5..4051b31310 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -27,8 +27,11 @@ namespace Bit.Api
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Api");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Api");
+            }
             Configuration = builder.Build();
             Environment = env;
         }
diff --git a/src/Api/settings.Preview.json b/src/Api/appsettings.Preview.json
similarity index 100%
rename from src/Api/settings.Preview.json
rename to src/Api/appsettings.Preview.json
diff --git a/src/Api/settings.Production.json b/src/Api/appsettings.Production.json
similarity index 100%
rename from src/Api/settings.Production.json
rename to src/Api/appsettings.Production.json
diff --git a/src/Api/settings.Staging.json b/src/Api/appsettings.Staging.json
similarity index 100%
rename from src/Api/settings.Staging.json
rename to src/Api/appsettings.Staging.json
diff --git a/src/Api/settings.json b/src/Api/appsettings.json
similarity index 100%
rename from src/Api/settings.json
rename to src/Api/appsettings.json
diff --git a/src/Billing/Startup.cs b/src/Billing/Startup.cs
index 1db7a11347..b41941a143 100644
--- a/src/Billing/Startup.cs
+++ b/src/Billing/Startup.cs
@@ -18,8 +18,11 @@ namespace Bit.Billing
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Billing");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Billing");
+            }
             Configuration = builder.Build();
         }
 
diff --git a/src/Billing/settings.Production.json b/src/Billing/appsettings.Production.json
similarity index 100%
rename from src/Billing/settings.Production.json
rename to src/Billing/appsettings.Production.json
diff --git a/src/Billing/settings.json b/src/Billing/appsettings.json
similarity index 100%
rename from src/Billing/settings.json
rename to src/Billing/appsettings.json
diff --git a/src/Core/Utilities/ConfigurationBuilderExtensions.cs b/src/Core/Utilities/ConfigurationBuilderExtensions.cs
deleted file mode 100644
index db04543773..0000000000
--- a/src/Core/Utilities/ConfigurationBuilderExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-
-namespace Bit.Core.Utilities
-{
-    public static class ConfigurationBuilderExtensions
-    {
-        public static IConfigurationBuilder AddSettingsConfiguration(
-            this ConfigurationBuilder builder,
-            IHostingEnvironment env,
-            string userSecretsId)
-        {
-            builder.SetBasePath(env.ContentRootPath)
-                .AddJsonFile("settings.json")
-                .AddJsonFile($"settings.{env.EnvironmentName}.json", optional: true);
-
-            if(env.IsDevelopment() && !string.IsNullOrWhiteSpace(userSecretsId))
-            {
-                builder.AddUserSecrets(userSecretsId);
-            }
-
-            return builder;
-        }
-    }
-}
diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs
index 65255f3d2e..53cbc481bc 100644
--- a/src/Identity/Startup.cs
+++ b/src/Identity/Startup.cs
@@ -15,8 +15,11 @@ namespace Bit.Identity
     {
         public Startup(IHostingEnvironment env)
         {
-            var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Identity");
+            var builder = new ConfigurationBuilder();
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Identity");
+            }
             Configuration = builder.Build();
             Environment = env;
         }
diff --git a/src/Identity/settings.Preview.json b/src/Identity/appsettings.Preview.json
similarity index 100%
rename from src/Identity/settings.Preview.json
rename to src/Identity/appsettings.Preview.json
diff --git a/src/Identity/settings.Production.json b/src/Identity/appsettings.Production.json
similarity index 100%
rename from src/Identity/settings.Production.json
rename to src/Identity/appsettings.Production.json
diff --git a/src/Identity/settings.Staging.json b/src/Identity/appsettings.Staging.json
similarity index 100%
rename from src/Identity/settings.Staging.json
rename to src/Identity/appsettings.Staging.json
diff --git a/src/Identity/settings.json b/src/Identity/appsettings.json
similarity index 100%
rename from src/Identity/settings.json
rename to src/Identity/appsettings.json
diff --git a/src/Jobs/Startup.cs b/src/Jobs/Startup.cs
index 9ac01ff99c..2f10f9a3bc 100644
--- a/src/Jobs/Startup.cs
+++ b/src/Jobs/Startup.cs
@@ -15,8 +15,17 @@ namespace Bit.Jobs
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()
-                .AddSettingsConfiguration(env, "bitwarden-Jobs")
-                .AddEnvironmentVariables();
+                .SetBasePath(env.ContentRootPath)
+                .AddJsonFile("appsettings.json")
+                .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
+
+            if(env.IsDevelopment())
+            {
+                builder.AddUserSecrets("bitwarden-Jobs");
+            }
+
+            builder.AddEnvironmentVariables();
+
             Configuration = builder.Build();
             Environment = env;
         }
diff --git a/src/Jobs/settings.Preview.json b/src/Jobs/appsettings.Preview.json
similarity index 100%
rename from src/Jobs/settings.Preview.json
rename to src/Jobs/appsettings.Preview.json
diff --git a/src/Jobs/settings.Production.json b/src/Jobs/appsettings.Production.json
similarity index 100%
rename from src/Jobs/settings.Production.json
rename to src/Jobs/appsettings.Production.json
diff --git a/src/Jobs/settings.Staging.json b/src/Jobs/appsettings.Staging.json
similarity index 100%
rename from src/Jobs/settings.Staging.json
rename to src/Jobs/appsettings.Staging.json
diff --git a/src/Jobs/settings.json b/src/Jobs/appsettings.json
similarity index 100%
rename from src/Jobs/settings.json
rename to src/Jobs/appsettings.json