diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
index 5cc17d57e2ec..83f416fa0089 100644
--- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
+++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Hosting;
 
 internal sealed class GenericWebHostBuilder : WebHostBuilderBase, ISupportsStartup
 {
-    private object? _startupObject;
+    private const string _startupConfigName = "__UseStartup.StartupObject";
     private readonly object _startupKey = new object();
 
     private AggregateException? _hostingStartupErrors;
@@ -170,13 +170,15 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // UseStartup can be called multiple times. Only run the last one.
-        _startupObject = startupType;
+        _builder.Properties[_startupConfigName] = startupType;
 
         _builder.ConfigureServices((context, services) =>
         {
             // Run this delegate if the startup type matches
-            if (object.ReferenceEquals(_startupObject, startupType))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, startupType))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 UseStartup(startupType, context, services);
             }
         });
@@ -193,7 +195,7 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = startupFactory;
+        _builder.Properties[_startupConfigName] = startupFactory;
 
         _builder.ConfigureServices(ConfigureStartup);
 
@@ -201,8 +203,10 @@ public IWebHostBuilder UseStartup([DynamicallyAccessedMembers(StartupLinkerOptio
         void ConfigureStartup(HostBuilderContext context, IServiceCollection services)
         {
             // UseStartup can be called multiple times. Only run the last one.
-            if (object.ReferenceEquals(_startupObject, startupFactory))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, startupFactory))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 var webHostBuilderContext = GetWebHostBuilderContext(context);
                 var instance = startupFactory(webHostBuilderContext) ?? throw new InvalidOperationException("The specified factory returned null startup instance.");
                 UseStartup(instance.GetType(), context, services, instance);
@@ -316,12 +320,14 @@ public IWebHostBuilder Configure(Action<IApplicationBuilder> configure)
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = configure;
+        _builder.Properties[_startupConfigName] = configure;
 
         _builder.ConfigureServices((context, services) =>
         {
-            if (object.ReferenceEquals(_startupObject, configure))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, configure))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 services.Configure<GenericWebHostServiceOptions>(options =>
                 {
                     options.ConfigureApplication = configure;
@@ -339,12 +345,14 @@ public IWebHostBuilder Configure(Action<WebHostBuilderContext, IApplicationBuild
         UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName);
 
         // Clear the startup type
-        _startupObject = configure;
+        _builder.Properties[_startupConfigName] = configure;
 
         _builder.ConfigureServices((context, services) =>
         {
-            if (object.ReferenceEquals(_startupObject, configure))
+            if (_builder.Properties.TryGetValue(_startupConfigName, out var startupObject) &&
+                object.ReferenceEquals(startupObject, configure))
             {
+                _builder.Properties.Remove(_startupConfigName);
                 services.Configure<GenericWebHostServiceOptions>(options =>
                 {
                     var webhostBuilderContext = GetWebHostBuilderContext(context);
diff --git a/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs b/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
index d517e6e0fe6b..5d940a63c8dc 100644
--- a/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
+++ b/src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Linq;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -128,6 +130,86 @@ public void ReadsUrlsOrPorts(string urls, string httpPorts, string httpsPorts, s
         Assert.Equal(expected, string.Join(';', server.Addresses));
     }
 
+    [Fact]
+    public async Task MultipleConfigureWebHostCallsWithUseStartupLastWins()
+    {
+        var server = new TestServer();
+        
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseServer(server)
+                    .UseStartup<FirstStartup>();
+            })
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseStartup<SecondStartup>();
+            })
+            .Build();
+
+        await host.StartAsync();
+        await AssertResponseContains(server.RequestDelegate, "SecondStartup");
+    }
+
+    [Fact]
+    public async Task MultipleConfigureWebHostCallsWithSameUseStartupOnlyRunsOne()
+    {
+        var server = new TestServer();
+
+        using var host = new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseServer(server)
+                    .UseStartup<FirstStartup>();
+            })
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseStartup<FirstStartup>();
+            })
+            .Build();
+
+        await host.StartAsync();
+        Assert.Single(host.Services.GetRequiredService<IEnumerable<FirstStartup>>());
+    }
+
+    private async Task AssertResponseContains(RequestDelegate app, string expectedText)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Response.Body = new MemoryStream();
+        await app(httpContext);
+        httpContext.Response.Body.Seek(0, SeekOrigin.Begin);
+        var bodyText = new StreamReader(httpContext.Response.Body).ReadToEnd();
+        Assert.Contains(expectedText, bodyText);
+    }
+
+    private class FirstStartup
+    {
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<FirstStartup>(); }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            Assert.NotNull(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.Null(app.ApplicationServices.GetService<SecondStartup>());
+            app.Run(context => context.Response.WriteAsync("FirstStartup"));
+        }
+    }
+
+    private class SecondStartup
+    {
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<SecondStartup>(); }
+
+        public void Configure(IApplicationBuilder app)
+        {
+            Assert.Null(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.NotNull(app.ApplicationServices.GetService<SecondStartup>());
+            app.Run(context => context.Response.WriteAsync("SecondStartup"));
+        }
+    }
+
     private class TestServer : IServer, IServerAddressesFeature
     {
         public TestServer()
@@ -139,9 +221,31 @@ public TestServer()
 
         public ICollection<string> Addresses { get; } = new List<string>();
         public bool PreferHostingUrls { get; set; }
+        public RequestDelegate RequestDelegate { get; private set; }
 
-        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken) => Task.CompletedTask;
-        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
         public void Dispose() { }
+
+        public Task StartAsync<TContext>(IHttpApplication<TContext> application, CancellationToken cancellationToken)
+        {
+            // For testing that uses RequestDelegate
+            RequestDelegate = async ctx =>
+            {
+                var httpContext = application.CreateContext(ctx.Features);
+                try
+                {
+                    await application.ProcessRequestAsync(httpContext);
+                }
+                catch (Exception ex)
+                {
+                    application.DisposeContext(httpContext, ex);
+                    throw;
+                }
+                application.DisposeContext(httpContext, null);
+            };
+
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
     }
 }
diff --git a/src/Hosting/Hosting/test/WebHostBuilderTests.cs b/src/Hosting/Hosting/test/WebHostBuilderTests.cs
index 0bd72551ec1e..caf6d2a6958f 100644
--- a/src/Hosting/Hosting/test/WebHostBuilderTests.cs
+++ b/src/Hosting/Hosting/test/WebHostBuilderTests.cs
@@ -1681,11 +1681,11 @@ public void Configure(IWebHostBuilder builder)
                        // This check is required because MVC still uses the
                        // IWebHostEnvironment instance before the container is baked
 #pragma warning disable CS0618 // Type or member is obsolete
-                       var heDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
+                       var heDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
                        Assert.NotNull(heDescriptor);
                        Assert.NotNull(heDescriptor.ImplementationInstance);
 #pragma warning restore CS0618 // Type or member is obsolete
-                       var wheDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
+                       var wheDescriptor = services.LastOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
                        Assert.NotNull(wheDescriptor);
                        Assert.NotNull(wheDescriptor.ImplementationInstance);
                    })
diff --git a/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
index e9587b50c032..f1ba5d5f2e0e 100644
--- a/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
+++ b/src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt
@@ -3,3 +3,4 @@ Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.StartServer(
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel() -> void
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(int port) -> void
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions!>! configureKestrelOptions) -> void
+virtual Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.CreateServer(System.IServiceProvider! serviceProvider) -> Microsoft.AspNetCore.TestHost.TestServer!
diff --git a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
index 5e028ac82230..926ab9bcf9b5 100644
--- a/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
+++ b/src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs
@@ -143,6 +143,7 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
         var factory = new DelegatedWebApplicationFactory(
             ClientOptions,
             CreateServer,
+            CreateServer,
             CreateHost,
             CreateWebHostBuilder,
             CreateHostBuilder,
@@ -337,7 +338,10 @@ private void ConfigureHostBuilder(IHostBuilder hostBuilder)
             }
             else
             {
-                webHostBuilder.UseTestServer();
+                webHostBuilder.ConfigureServices(services =>
+                {
+                    services.AddSingleton<IServer>(CreateServer);
+                });
             }
         });
         _host = CreateHost(hostBuilder);
@@ -565,10 +569,19 @@ private static void EnsureDepsFile()
     /// <returns>The <see cref="TestServer"/> with the bootstrapped application.</returns>
     protected virtual TestServer CreateServer(IWebHostBuilder builder) => new(builder);
 
+    /// <summary>
+    /// Creates the <see cref="TestServer"/> with the <see cref="IServiceProvider"/> from the bootstrapped application.
+    /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateHost"/> instead.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/> from the bootstrapped application.</param>
+    /// <returns></returns>
+    protected virtual TestServer CreateServer(IServiceProvider serviceProvider) => new(serviceProvider);
+
     /// <summary>
     /// Creates the <see cref="IHost"/> with the bootstrapped application in <paramref name="builder"/>.
     /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
-    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer"/> instead.
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer(IWebHostBuilder)"/> instead.
     /// </summary>
     /// <param name="builder">The <see cref="IHostBuilder"/> used to create the host.</param>
     /// <returns>The <see cref="IHost"/> with the bootstrapped application.</returns>
@@ -801,6 +814,7 @@ public virtual async ValueTask DisposeAsync()
     private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEntryPoint>
     {
         private readonly Func<IWebHostBuilder, TestServer> _createServer;
+        private readonly Func<IServiceProvider, TestServer> _createServerFromServiceProvider;
         private readonly Func<IHostBuilder, IHost> _createHost;
         private readonly Func<IWebHostBuilder?> _createWebHostBuilder;
         private readonly Func<IHostBuilder?> _createHostBuilder;
@@ -810,6 +824,7 @@ private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEnt
         public DelegatedWebApplicationFactory(
             WebApplicationFactoryClientOptions options,
             Func<IWebHostBuilder, TestServer> createServer,
+            Func<IServiceProvider, TestServer> createServerFromServiceProvider,
             Func<IHostBuilder, IHost> createHost,
             Func<IWebHostBuilder?> createWebHostBuilder,
             Func<IHostBuilder?> createHostBuilder,
@@ -819,6 +834,7 @@ public DelegatedWebApplicationFactory(
         {
             ClientOptions = new WebApplicationFactoryClientOptions(options);
             _createServer = createServer;
+            _createServerFromServiceProvider = createServerFromServiceProvider;
             _createHost = createHost;
             _createWebHostBuilder = createWebHostBuilder;
             _createHostBuilder = createHostBuilder;
@@ -829,6 +845,8 @@ public DelegatedWebApplicationFactory(
 
         protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder);
 
+        protected override TestServer CreateServer(IServiceProvider serviceProvider) => _createServerFromServiceProvider(serviceProvider);
+
         protected override IHost CreateHost(IHostBuilder builder) => _createHost(builder);
 
         protected override IWebHostBuilder? CreateWebHostBuilder() => _createWebHostBuilder();
@@ -846,6 +864,7 @@ internal override WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Acti
             return new DelegatedWebApplicationFactory(
                 ClientOptions,
                 _createServer,
+                _createServerFromServiceProvider,
                 _createHost,
                 _createWebHostBuilder,
                 _createHostBuilder,
diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
index b1db2fa974fd..610267f8b813 100644
--- a/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -229,25 +230,29 @@ private void DropDatabaseTables(IServiceProvider services)
 
         public static void Main(string[] args)
         {
-            var host = CreateWebHostBuilder(args)
+            using var host = CreateHost(args)
                 .Build();
 
             host.Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        public static IHostBuilder CreateHost(string[] args)
         {
             var configuration = new ConfigurationBuilder()
                 .AddEnvironmentVariables()
                 .AddCommandLine(args)
                 .Build();
 
-            return new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://+:5000")
-                .UseConfiguration(configuration)
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseStartup<Startup>();
+            return new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseUrls("http://+:5000")
+                        .UseConfiguration(configuration)
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseStartup<Startup>();
+                });
         }
     }
 }
diff --git a/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
index cf4914be126c..131072630160 100644
--- a/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs
@@ -8,6 +8,7 @@
 #endif
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
@@ -191,26 +192,30 @@ private void DropDatabaseTables(IServiceProvider services)
 
         public static void Main(string[] args)
         {
-            var host = CreateWebHostBuilder(args)
+            using var host = CreateHost(args)
                 .Build();
 
             host.Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        public static IHostBuilder CreateHost(string[] args)
         {
             var configuration = new ConfigurationBuilder()
                 .AddEnvironmentVariables()
                 .AddCommandLine(args)
                 .Build();
 
-            return new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://+:5000")
-                .UseConfiguration(configuration)
-                .UseIISIntegration()
-                .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseStartup<Startup>();
+            return new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseUrls("http://+:5000")
+                        .UseConfiguration(configuration)
+                        .UseIISIntegration()
+                        .UseContentRoot(Directory.GetCurrentDirectory())
+                        .UseStartup<Startup>();
+                });
         }
     }
 }
diff --git a/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
index c332e9f2a8be..cc36aeaf08bb 100644
--- a/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
+++ b/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs
@@ -4,6 +4,7 @@
 using Data;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Html;
@@ -60,24 +61,28 @@ private static List<DataB> GenerateDataB()
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHost(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+    public static IHostBuilder CreateHost(string[] args)
     {
         var configuration = new ConfigurationBuilder()
             .AddEnvironmentVariables()
             .AddCommandLine(args)
             .Build();
 
-        return new WebHostBuilder()
-            .UseKestrel()
-            .UseUrls("http://+:5000")
-            .UseConfiguration(configuration)
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>();
+        return new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseUrls("http://+:5000")
+                    .UseConfiguration(configuration)
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>();
+            });
     }
 }
diff --git a/src/Mvc/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
index 2708a0c0b47c..95b307f30108 100644
--- a/src/Mvc/samples/MvcSandbox/Startup.cs
+++ b/src/Mvc/samples/MvcSandbox/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace MvcSandbox;
 
 public class Startup
@@ -42,22 +44,26 @@ static void ConfigureEndpoints(IEndpointRouteBuilder endpoints)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .ConfigureLogging(factory =>
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
             {
-                factory
-                    .AddConsole()
-                    .AddDebug();
-            })
-            .UseKestrel()
-            .UseStartup<Startup>();
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .ConfigureLogging(factory =>
+                    {
+                        factory
+                            .AddConsole()
+                            .AddDebug();
+                    })
+                    .UseKestrel()
+                    .UseStartup<Startup>();
+            });
 }
 
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
index 5f9a0054bf4e..2c575743e210 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
@@ -3,10 +3,9 @@
 
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.WebEncoders.Testing;
-using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
 
@@ -20,9 +19,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         base.ConfigureWebHost(builder);
         builder.ConfigureServices(services =>
         {
-            services.TryAddTransient<HtmlEncoder, HtmlTestEncoder>();
-            services.TryAddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
-            services.TryAddTransient<UrlEncoder, UrlTestEncoder>();
+            services.AddTransient<HtmlEncoder, HtmlTestEncoder>();
+            services.AddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
+            services.AddTransient<UrlEncoder, UrlTestEncoder>();
         });
     }
 }
diff --git a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
index e3a7bfdb7fe5..482b45fbd744 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs
@@ -25,7 +25,6 @@ protected override void Initialize(TestContext context, MethodInfo methodInfo, o
     {
         base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
         Factory = new MvcTestFixture<RazorBuildWebSite.Startup>(LoggerFactory)
-            .WithWebHostBuilder(b => b.UseStartup<RazorBuildWebSite.Startup>())
             .WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure<MvcRazorRuntimeCompilationOptions>(ConfigureRuntimeCompilationOptions)));
 
         static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)
diff --git a/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
index 9f4162734292..b50e3be4a43c 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
+++ b/src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
@@ -26,11 +26,11 @@ public void TestingInfrastructure_WebHost_WithWebHostBuilderRespectsCustomizatio
         // Assert
         Assert.Equal(new[] { "ConfigureWebHost", "Customization", "FurtherCustomization" }, factory.ConfigureWebHostCalled.ToArray());
         Assert.True(factory.CreateServerCalled);
-        Assert.True(factory.CreateWebHostBuilderCalled);
+        Assert.False(factory.CreateWebHostBuilderCalled);
         // GetTestAssemblies is not called when reading content roots from MvcAppManifest
         Assert.False(factory.GetTestAssembliesCalled);
         Assert.True(factory.CreateHostBuilderCalled);
-        Assert.False(factory.CreateHostCalled);
+        Assert.True(factory.CreateHostCalled);
     }
 
     [Fact]
@@ -48,7 +48,7 @@ public void TestingInfrastructure_GenericHost_WithWithHostBuilderRespectsCustomi
         Assert.False(factory.GetTestAssembliesCalled);
         Assert.True(factory.CreateHostBuilderCalled);
         Assert.True(factory.CreateHostCalled);
-        Assert.False(factory.CreateServerCalled);
+        Assert.True(factory.CreateServerCalled);
         Assert.False(factory.CreateWebHostBuilderCalled);
     }
 
@@ -147,6 +147,12 @@ protected override TestServer CreateServer(IWebHostBuilder builder)
             return base.CreateServer(builder);
         }
 
+        protected override TestServer CreateServer(IServiceProvider serviceProvider)
+        {
+            CreateServerCalled = true;
+            return base.CreateServer(serviceProvider);
+        }
+
         protected override IHost CreateHost(IHostBuilder builder)
         {
             CreateHostCalled = true;
diff --git a/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
index c2bfec25d45e..22ab7f53d20a 100644
--- a/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
@@ -4,6 +4,7 @@
 using ApiExplorerWebSite.Controllers;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.Extensions.Hosting;
 
 namespace ApiExplorerWebSite;
 
@@ -45,17 +46,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseKestrel()
-            .UseIISIntegration()
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseKestrel()
+                    .UseIISIntegration()
+                    .UseStartup<Startup>();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
index ab31d94048cd..20962f53c44b 100644
--- a/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace ApplicationModelWebSite;
 
 public class Startup
@@ -34,17 +36,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Program.cs b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
index 2940ac16caec..a73dd5d7b4b4 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
@@ -1,20 +1,29 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace BasicWebSite;
 
 public class Program
 {
-    public static void Main(string[] args) => CreateWebHostBuilder(args).Build().Run();
+    public static void Main(string[] args)
+    {
+        using var host = CreateHostBuilder(args).Build();
+        host.Run();
+    }
 
-    // Do not change. This is the pattern our test infrastructure uses to initialize a IWebHostBuilder from
-    // a users app.
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<StartupWithoutEndpointRouting>()
-            .UseKestrel()
-            .UseIISIntegration();
+    // This method now returns IHostBuilder and uses the new pattern with HostBuilder and ConfigureWebHost
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<StartupWithoutEndpointRouting>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
 public class TestService
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
index 2e236143f638..ca1fe86ab6da 100644
--- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
@@ -6,6 +6,7 @@
 using ControllersFromServicesWebSite.Components;
 using ControllersFromServicesWebSite.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.Hosting;
 
 namespace ControllersFromServicesWebSite;
 
@@ -61,17 +62,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/CorsWebSite/Program.cs b/src/Mvc/test/WebSites/CorsWebSite/Program.cs
index d6bef8cec94e..fffa0760a8dc 100644
--- a/src/Mvc/test/WebSites/CorsWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/CorsWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace CorsWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
index d459fadc0c7a..a3aae2df48ce 100644
--- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace ErrorPageMiddlewareWebSite;
 
 public class Startup
@@ -24,17 +26,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/FilesWebSite/Startup.cs b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
index b2028da6904b..bdee1296991f 100644
--- a/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace FilesWebSite;
 
 public class Startup
@@ -23,16 +25,20 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/FormatterWebSite/Program.cs b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
index 6235f2d3214f..55d6b0c04c25 100644
--- a/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace FormatterWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
index 4ac4a3edbdf6..baab04ea7b8b 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Hosting;
 
 namespace HtmlGenerationWebSite;
 
@@ -48,18 +49,22 @@ public virtual void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 
     protected virtual void ConfigureMvcOptions(MvcOptions options)
     {
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
index da8475622054..1f8da4281eb3 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
+using Microsoft.Extensions.Hosting;
 
 namespace HtmlGenerationWebSite;
 
@@ -31,10 +32,14 @@ public void Configure(IApplicationBuilder app)
         Startup.Configure(app);
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<StartupWithCultureReplace>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<StartupWithCultureReplace>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
index 95325f20d4f2..82da4815dba1 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorBuildWebSite;
 
 public class Startup
@@ -25,10 +27,14 @@ public void Configure(IApplicationBuilder app)
         });
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-        .UseContentRoot(Directory.GetCurrentDirectory())
-        .UseStartup<Startup>()
-        .UseKestrel()
-        .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
index 78c56e00ed5a..8fde980c5abf 100644
--- a/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
+++ b/src/Mvc/test/WebSites/RazorBuildWebSite/StartupWithHostingStartup.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.Extensions.Hosting;
 
 namespace RazorBuildWebSite;
 
@@ -34,17 +35,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-        .UseContentRoot(Directory.GetCurrentDirectory())
-        .UseStartup<Startup>()
-        .UseKestrel();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel();
+            });
 
     private class MockMvcBuilder : IMvcBuilder
     {
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
index 8440222b2671..39720535fdbb 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorPagesWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseIISIntegration()
-            .UseStartup<StartupWithBasePath>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseIISIntegration()
+                    .UseStartup<StartupWithBasePath>();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Program.cs b/src/Mvc/test/WebSites/RazorWebSite/Program.cs
index 63f000d9e68c..df37aa1be8d9 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RazorWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RazorWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/Program.cs b/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
index e87a93791ee6..d872250cf5bd 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
@@ -1,22 +1,28 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace RoutingWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<StartupForFallback>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<StartupForFallback>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Program.cs b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
index 9aaddc6b3c38..440a2774ebaa 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
@@ -1,21 +1,27 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace SecurityWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseKestrel()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseKestrel()
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>();
+            });
 }
diff --git a/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
index 5a87688449dd..e5faf5d06d32 100644
--- a/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
@@ -29,17 +30,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
index 67990ce51d8b..71a933ba44ab 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace TagHelpersWebSite;
 
 public class Startup
@@ -23,18 +25,22 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStaticWebAssets()
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStaticWebAssets()
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
 
diff --git a/src/Mvc/test/WebSites/VersioningWebSite/Program.cs b/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
index bdb3e48f5746..8f535ad23228 100644
--- a/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
+++ b/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
@@ -1,22 +1,28 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Hosting;
+
 namespace VersioningWebSite;
 
 public class Program
 {
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }
diff --git a/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
index 956fd0f33233..b747c6b08438 100644
--- a/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
+++ b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Net.Http.Headers;
 
 namespace XmlFormattersWebSite;
@@ -109,17 +110,21 @@ public void Configure(IApplicationBuilder app)
 
     public static void Main(string[] args)
     {
-        var host = CreateWebHostBuilder(args)
+        using var host = CreateHostBuilder(args)
             .Build();
 
         host.Run();
     }
 
-    public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-        new WebHostBuilder()
-            .UseContentRoot(Directory.GetCurrentDirectory())
-            .UseStartup<Startup>()
-            .UseKestrel()
-            .UseIISIntegration();
+    public static IHostBuilder CreateHostBuilder(string[] args) =>
+        new HostBuilder()
+            .ConfigureWebHost(webHostBuilder =>
+            {
+                webHostBuilder
+                    .UseContentRoot(Directory.GetCurrentDirectory())
+                    .UseStartup<Startup>()
+                    .UseKestrel()
+                    .UseIISIntegration();
+            });
 }