diff --git a/tests/DevApps/ciam/myWebApi/Program.cs b/tests/DevApps/ciam/myWebApi/Program.cs
index f37c187be..af505604e 100644
--- a/tests/DevApps/ciam/myWebApi/Program.cs
+++ b/tests/DevApps/ciam/myWebApi/Program.cs
@@ -11,19 +11,11 @@
     .AddMicrosoftIdentityWebApi(builder.Configuration.GetSection("AzureAd"));
 
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+// Learn more about configuring OpenAPI at https://learn.microsoft.com/aspnet/core/fundamentals/openapi/aspnetcore-openapi
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
 app.UseHttpsRedirection();
 
 app.UseAuthorization();
diff --git a/tests/DevApps/ciam/myWebApi/Properties/launchSettings.json b/tests/DevApps/ciam/myWebApi/Properties/launchSettings.json
index 2946688bc..960b873bd 100644
--- a/tests/DevApps/ciam/myWebApi/Properties/launchSettings.json
+++ b/tests/DevApps/ciam/myWebApi/Properties/launchSettings.json
@@ -13,7 +13,6 @@
         "commandName": "Project",
         "dotnetRunMessages": true,
         "launchBrowser": true,
-        "launchUrl": "swagger",
         "applicationUrl": "https://localhost:7082;http://localhost:5299;",
         "environmentVariables": {
             "ASPNETCORE_ENVIRONMENT": "Development"
@@ -22,7 +21,6 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/tests/DevApps/ciam/myWebApi/myWebApi.csproj b/tests/DevApps/ciam/myWebApi/myWebApi.csproj
index c51f8d388..b1f412a5e 100644
--- a/tests/DevApps/ciam/myWebApi/myWebApi.csproj
+++ b/tests/DevApps/ciam/myWebApi/myWebApi.csproj
@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.10" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UseWIP)' == 'false' ">
diff --git a/tests/DevApps/daemon-app/minimal-web-api/MinimalWebApi.csproj b/tests/DevApps/daemon-app/minimal-web-api/MinimalWebApi.csproj
index e8695bd70..2aa4ee44e 100644
--- a/tests/DevApps/daemon-app/minimal-web-api/MinimalWebApi.csproj
+++ b/tests/DevApps/daemon-app/minimal-web-api/MinimalWebApi.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UseWip)' != 'true'">
diff --git a/tests/DevApps/daemon-app/minimal-web-api/Program.cs b/tests/DevApps/daemon-app/minimal-web-api/Program.cs
index cf12a1907..ecff0b768 100644
--- a/tests/DevApps/daemon-app/minimal-web-api/Program.cs
+++ b/tests/DevApps/daemon-app/minimal-web-api/Program.cs
@@ -5,21 +5,13 @@
 // Add services to the container.
 
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+// Learn more about configuring OpenAPI at https://learn.microsoft.com/aspnet/core/fundamentals/openapi/aspnetcore-openapi
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
 
 builder.Services.AddMicrosoftIdentityWebApiAuthentication(builder.Configuration);
 
 var app = builder.Build();
 
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
 app.UseHttpsRedirection();
 
 app.UseAuthorization();
diff --git a/tests/DevApps/daemon-app/minimal-web-api/Properties/launchSettings.json b/tests/DevApps/daemon-app/minimal-web-api/Properties/launchSettings.json
index 03ba802b0..e1ac66b78 100644
--- a/tests/DevApps/daemon-app/minimal-web-api/Properties/launchSettings.json
+++ b/tests/DevApps/daemon-app/minimal-web-api/Properties/launchSettings.json
@@ -13,7 +13,6 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "swagger",
       "applicationUrl": "http://localhost:5047",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -23,7 +22,6 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "launchUrl": "swagger",
       "applicationUrl": "https://localhost:7060;http://localhost:5047",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -32,7 +30,6 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }