diff --git a/src/MusicStore.Standalone/Program.cs b/src/MusicStore.Standalone/Program.cs
index ad4d296818..e4487c597d 100644
--- a/src/MusicStore.Standalone/Program.cs
+++ b/src/MusicStore.Standalone/Program.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Net.Http.Server;
 
 namespace MusicStore.Standalone
@@ -7,11 +8,16 @@ namespace MusicStore.Standalone
     {
         public static void Main(string[] args)
         {
+            var config = new ConfigurationBuilder()
+                .AddCommandLine(args)
+                .AddEnvironmentVariables(prefix: "ASPNETCORE_")
+                .Build();
+
             var builder = new WebHostBuilder()
                 // We set the server by name before default args so that command line arguments can override it.
                 // This is used to allow deployers to choose the server for testing.
                 .UseServer("Microsoft.AspNetCore.Server.Kestrel")
-                .UseDefaultHostingConfiguration(args)
+                .UseConfiguration(config)
                 .UseIISIntegration()
                 .UseStartup("MusicStore.Standalone");
 
diff --git a/src/MusicStore/Program.cs b/src/MusicStore/Program.cs
index 2c422547ae..0117de8799 100644
--- a/src/MusicStore/Program.cs
+++ b/src/MusicStore/Program.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Net.Http.Server;
 
 namespace MusicStore
@@ -7,8 +8,13 @@ namespace MusicStore
     {
         public static void Main(string[] args)
         {
+            var config = new ConfigurationBuilder()
+                .AddCommandLine(args)
+                .AddEnvironmentVariables(prefix: "ASPNETCORE_")
+                .Build();
+
             var builder = new WebHostBuilder()
-                .UseDefaultHostingConfiguration(args)
+                .UseConfiguration(config)
                 .UseIISIntegration()
                 .UseStartup("MusicStore");