diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs
index ed0dc807f7..3419947f5e 100644
--- a/samples/DatabaseErrorPageSample/Startup.cs
+++ b/samples/DatabaseErrorPageSample/Startup.cs
@@ -31,6 +31,7 @@ namespace DatabaseErrorPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/DatabaseErrorPageSample/hosting.json b/samples/DatabaseErrorPageSample/hosting.json
deleted file mode 100644
index 26fd5141aa..0000000000
--- a/samples/DatabaseErrorPageSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
\ No newline at end of file
diff --git a/samples/DeveloperExceptionPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs
index 0608fb10d9..a6068e43fc 100644
--- a/samples/DeveloperExceptionPageSample/Startup.cs
+++ b/samples/DeveloperExceptionPageSample/Startup.cs
@@ -23,6 +23,7 @@ namespace DeveloperExceptionPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/DeveloperExceptionPageSample/hosting.json b/samples/DeveloperExceptionPageSample/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/samples/DeveloperExceptionPageSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs
index e0cfa4c4e7..fad9ba2adb 100644
--- a/samples/ElmPageSample/Startup.cs
+++ b/samples/ElmPageSample/Startup.cs
@@ -33,6 +33,7 @@ namespace ElmPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/ElmPageSample/hosting.json b/samples/ElmPageSample/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/samples/ElmPageSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/samples/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs
index 6202a0d9ed..dc8fcdb851 100644
--- a/samples/ExceptionHandlerSample/Startup.cs
+++ b/samples/ExceptionHandlerSample/Startup.cs
@@ -60,6 +60,7 @@ namespace ExceptionHandlerSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/ExceptionHandlerSample/hosting.json b/samples/ExceptionHandlerSample/hosting.json
deleted file mode 100644
index 26fd5141aa..0000000000
--- a/samples/ExceptionHandlerSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
\ No newline at end of file
diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs
index 602e186947..0a24ae53ac 100644
--- a/samples/MiddlewareAnalysisSample/Startup.cs
+++ b/samples/MiddlewareAnalysisSample/Startup.cs
@@ -87,6 +87,7 @@ namespace MiddlewareAnaysisSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/MiddlewareAnalysisSample/hosting.json b/samples/MiddlewareAnalysisSample/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/samples/MiddlewareAnalysisSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/samples/RuntimeInfoPageSample/Startup.cs b/samples/RuntimeInfoPageSample/Startup.cs
index f713e37b45..347ce1b4d6 100644
--- a/samples/RuntimeInfoPageSample/Startup.cs
+++ b/samples/RuntimeInfoPageSample/Startup.cs
@@ -23,6 +23,7 @@ namespace RuntimeInfoPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/RuntimeInfoPageSample/hosting.json b/samples/RuntimeInfoPageSample/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/samples/RuntimeInfoPageSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}
diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs
index 7fc0f9f1c8..4e7815a088 100644
--- a/samples/StatusCodePagesSample/Startup.cs
+++ b/samples/StatusCodePagesSample/Startup.cs
@@ -106,6 +106,7 @@ namespace StatusCodePagesSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/StatusCodePagesSample/hosting.json b/samples/StatusCodePagesSample/hosting.json
deleted file mode 100644
index a55cb2dcef..0000000000
--- a/samples/StatusCodePagesSample/hosting.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel",
-  "server.urls": "http://localhost:5001/base"
-}
diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs
index 6fe69c2bc0..f5d0a11521 100644
--- a/samples/WelcomePageSample/Startup.cs
+++ b/samples/WelcomePageSample/Startup.cs
@@ -14,6 +14,7 @@ namespace WelcomePageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/samples/WelcomePageSample/hosting.json b/samples/WelcomePageSample/hosting.json
deleted file mode 100644
index 6a93dbafa8..0000000000
--- a/samples/WelcomePageSample/hosting.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}