diff --git a/8.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj b/8.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
index bae306e3..3de48c5b 100644
--- a/8.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/8.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
@@ -9,6 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/8.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs b/8.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
index ff1e7c6d..3d855905 100644
--- a/8.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
+++ b/8.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
@@ -23,8 +23,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/8.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json b/8.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/8.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
+++ b/8.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
index be65515f..dfb36658 100644
--- a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
@@ -10,6 +10,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
index fd58447e..a453aac9 100644
--- a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
+++ b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
@@ -26,8 +26,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
+++ b/8.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
index bae306e3..3de48c5b 100644
--- a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
@@ -9,6 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
index ff1e7c6d..3d855905 100644
--- a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
+++ b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
@@ -23,8 +23,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
+++ b/8.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
index d32a67ce..9e4a22b3 100644
--- a/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppEntra/MinimalApiJwt/MinimalApiJwt.csproj
@@ -9,6 +9,8 @@
 
   <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 ff1e7c6d..3d855905 100644
--- a/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppEntra/MinimalApiJwt/Program.cs
@@ -23,8 +23,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/9.0/BlazorWebAppEntra/MinimalApiJwt/Properties/launchSettings.json b/9.0/BlazorWebAppEntra/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/9.0/BlazorWebAppEntra/MinimalApiJwt/Properties/launchSettings.json
+++ b/9.0/BlazorWebAppEntra/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
index 149939dc..139bfcf5 100644
--- a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/MinimalApiJwt.csproj
@@ -10,6 +10,8 @@
   <ItemGroup>
     <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 e2276b13..e9003252 100644
--- a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Program.cs
@@ -27,8 +27,22 @@
 
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Properties/launchSettings.json b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Properties/launchSettings.json
+++ b/9.0/BlazorWebAppEntraBff/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
index 4dc1c22e..52da0168 100644
--- a/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppOidc/MinimalApiJwt/MinimalApiJwt.csproj
@@ -9,6 +9,8 @@
 
   <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 8b230b38..7cb7b0d7 100644
--- a/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppOidc/MinimalApiJwt/Program.cs
@@ -23,8 +23,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/9.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json b/9.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/9.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
+++ b/9.0/BlazorWebAppOidc/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
index 4a1f340a..23e34c2c 100644
--- a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/MinimalApiJwt.csproj
@@ -10,6 +10,8 @@
   <ItemGroup>
     <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 fd58447e..a453aac9 100644
--- a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Program.cs
@@ -26,8 +26,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
+++ b/9.0/BlazorWebAppOidcBff/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/9.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
index 4dc1c22e..52da0168 100644
--- a/9.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
+++ b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/MinimalApiJwt.csproj
@@ -9,6 +9,8 @@
 
   <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/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
index ff1e7c6d..3d855905 100644
--- a/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
+++ b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Program.cs
@@ -23,8 +23,22 @@
     });
 builder.Services.AddAuthorization();
 
+// Add OpenApi 
+builder.Services.AddOpenApi();
+
 var app = builder.Build();
 
+// Configure Swagger UI
+if (app.Environment.IsDevelopment())
+{
+    app.MapOpenApi();
+
+    app.UseSwaggerUI(options =>
+    {
+        options.SwaggerEndpoint("/openapi/v1.json", "v1");
+    });
+}
+
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
diff --git a/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
index bce54cc3..437b926e 100644
--- a/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
+++ b/9.0/BlazorWebAppOidcServer/MinimalApiJwt/Properties/launchSettings.json
@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "weather-forecast",
+      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7277;http://localhost:5163",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"