diff --git a/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
index 9e4a22b3f..e4005fa59 100644
--- a/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs b/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs
index 3d855905f..ccb694e01 100644
--- a/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs
@@ -32,11 +32,6 @@
 if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
-
-    app.UseSwaggerUI(options =>
-    {
-        options.SwaggerEndpoint("/openapi/v1.json", "v1");
-    });
 }
 
 // Configure the HTTP request pipeline.
diff --git a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
index 139bfcf52..dc607fcd5 100644
--- a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
@@ -11,7 +11,6 @@
     <ProjectReference Include="..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs
index e90032523..ad2b3da59 100644
--- a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs
@@ -36,11 +36,6 @@
 if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
-
-    app.UseSwaggerUI(options =>
-    {
-        options.SwaggerEndpoint("/openapi/v1.json", "v1");
-    });
 }
 
 // Configure the HTTP request pipeline.
diff --git a/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
index 52da0168f..295f40f8e 100644
--- a/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs b/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
index 7cb7b0d74..c8221fc0d 100644
--- a/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
@@ -32,11 +32,6 @@
 if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
-
-    app.UseSwaggerUI(options =>
-    {
-        options.SwaggerEndpoint("/openapi/v1.json", "v1");
-    });
 }
 
 // Configure the HTTP request pipeline.
diff --git a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
index 23e34c2cb..428db5591 100644
--- a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
@@ -11,7 +11,6 @@
     <ProjectReference Include="..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
index a453aac9d..d4c0cf900 100644
--- a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
@@ -35,11 +35,6 @@
 if (app.Environment.IsDevelopment())
 {
     app.MapOpenApi();
-
-    app.UseSwaggerUI(options =>
-    {
-        options.SwaggerEndpoint("/openapi/v1.json", "v1");
-    });
 }
 
 // Configure the HTTP request pipeline.
diff --git a/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/MauiBlazorWeb.Web.csproj b/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/MauiBlazorWeb.Web.csproj
index 625ae3785..141065cc0 100644
--- a/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/MauiBlazorWeb.Web.csproj
+++ b/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/MauiBlazorWeb.Web.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/Program.cs b/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/Program.cs
index f1ecf0e34..a2ae3e5ae 100644
--- a/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/Program.cs
+++ b/9.0/MauiBlazorWebIdentity/MauiBlazorWeb/MauiBlazorWeb.Web/Program.cs
@@ -3,7 +3,6 @@
 using MauiBlazorWeb.Web.Components.Account;
 using MauiBlazorWeb.Web.Data;
 using MauiBlazorWeb.Web.Services;
-using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
@@ -41,9 +40,10 @@
 
 builder.Services.AddSingleton<IEmailSender<ApplicationUser>, IdentityNoOpEmailSender>();
 
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+// For more information on OpenAPI support in ASP.NET Core,
+// see OpenAPI support in ASP.NET Core API apps at
+// https://learn.microsoft.com/aspnet/core/fundamentals/openapi/overview
+builder.Services.AddOpenApi();
 
 var app = builder.Build();
 
@@ -57,8 +57,7 @@
         dbContext.Database.Migrate();
     }
     app.UseMigrationsEndPoint();
-    app.UseSwagger();
-    app.UseSwaggerUI();
+    app.MapOpenApi();
 }
 else
 {