diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs
index 3f8ee8fedc..5c46f74cf9 100644
--- a/samples/DatabaseErrorPageSample/Startup.cs
+++ b/samples/DatabaseErrorPageSample/Startup.cs
@@ -30,7 +30,7 @@ namespace DatabaseErrorPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -55,3 +55,4 @@ namespace DatabaseErrorPageSample
         public string Url { get; set; }
     }
 }
+
diff --git a/samples/DeveloperExceptionPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs
index 1b1696d7c7..60e4ff82b2 100644
--- a/samples/DeveloperExceptionPageSample/Startup.cs
+++ b/samples/DeveloperExceptionPageSample/Startup.cs
@@ -23,7 +23,7 @@ namespace DeveloperExceptionPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -31,4 +31,4 @@ namespace DeveloperExceptionPageSample
             host.Run();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs
index 37a63e7e11..17906fa009 100644
--- a/samples/ElmPageSample/Startup.cs
+++ b/samples/ElmPageSample/Startup.cs
@@ -31,7 +31,7 @@ namespace ElmPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -40,3 +40,4 @@ namespace ElmPageSample
         }
     }
 }
+
diff --git a/samples/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs
index 4f086800d9..ac2ada7782 100644
--- a/samples/ExceptionHandlerSample/Startup.cs
+++ b/samples/ExceptionHandlerSample/Startup.cs
@@ -60,7 +60,7 @@ namespace ExceptionHandlerSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -69,3 +69,4 @@ namespace ExceptionHandlerSample
         }
     }
 }
+
diff --git a/samples/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs
index d674722405..843c1acf36 100644
--- a/samples/MiddlewareAnalysisSample/Startup.cs
+++ b/samples/MiddlewareAnalysisSample/Startup.cs
@@ -87,7 +87,7 @@ namespace MiddlewareAnaysisSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -117,3 +117,4 @@ namespace MiddlewareAnaysisSample
         }
     }
 }
+
diff --git a/samples/RuntimeInfoPageSample/Startup.cs b/samples/RuntimeInfoPageSample/Startup.cs
index af5dc207c0..bd725855f2 100644
--- a/samples/RuntimeInfoPageSample/Startup.cs
+++ b/samples/RuntimeInfoPageSample/Startup.cs
@@ -23,7 +23,7 @@ namespace RuntimeInfoPageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -32,3 +32,4 @@ namespace RuntimeInfoPageSample
         }
     }
 }
+
diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs
index 046e98e8be..5ff7e7a211 100644
--- a/samples/StatusCodePagesSample/Startup.cs
+++ b/samples/StatusCodePagesSample/Startup.cs
@@ -106,7 +106,7 @@ namespace StatusCodePagesSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -114,4 +114,4 @@ namespace StatusCodePagesSample
             host.Run();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs
index 842547651a..9388cf826f 100644
--- a/samples/WelcomePageSample/Startup.cs
+++ b/samples/WelcomePageSample/Startup.cs
@@ -14,7 +14,7 @@ namespace WelcomePageSample
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
+                .UseKestrel()
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
@@ -23,3 +23,4 @@ namespace WelcomePageSample
         }
     }
 }
+