diff --git a/BervProject.WebApi.Boilerplate/BervProject.WebApi.Boilerplate.csproj b/BervProject.WebApi.Boilerplate/BervProject.WebApi.Boilerplate.csproj
index ca54c786..20d789c2 100644
--- a/BervProject.WebApi.Boilerplate/BervProject.WebApi.Boilerplate.csproj
+++ b/BervProject.WebApi.Boilerplate/BervProject.WebApi.Boilerplate.csproj
@@ -14,6 +14,11 @@
     <DocumentationFile>bin\Release\BervProject.WebApi.Boilerplate.xml</DocumentationFile>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <OpenApiGenerateDocuments>true</OpenApiGenerateDocuments>
+    <OpenApiDocumentsDirectory>$(MSBuildProjectDirectory)</OpenApiDocumentsDirectory>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Autofac" Version="9.0.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
@@ -31,18 +36,25 @@
     <PackageReference Include="Hangfire.PostgreSql" Version="1.20.12" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.13.1" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NLog" Version="6.0.6" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="6.1.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -53,11 +65,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
-  <PackageReference Include="System.Net.Http" Version="4.3.4" />
-  <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <InternalsVisibleTo Include="BervProject.WebApi.Integration.Test" />
   </ItemGroup>
 
diff --git a/BervProject.WebApi.Boilerplate/Program.cs b/BervProject.WebApi.Boilerplate/Program.cs
index b60b095e..5be4c935 100644
--- a/BervProject.WebApi.Boilerplate/Program.cs
+++ b/BervProject.WebApi.Boilerplate/Program.cs
@@ -15,11 +15,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.OpenApi.Models;
 using NLog.Web;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.AddServiceDefaults();
+if (Assembly.GetEntryAssembly()?.GetName().Name != "GetDocument.Insider")
+{
+    builder.AddServiceDefaults();
+}
 builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());
 builder.Logging.ClearProviders();
 builder.Logging.SetMinimumLevel(LogLevel.Trace);
@@ -56,17 +58,7 @@
 
 builder.Services.AddControllers();
 builder.Services.AddApiVersioning();
-builder.Services.AddSwaggerGen(options =>
-{
-    var xmlFilename = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    options.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFilename));
-    options.SwaggerDoc("v1", new OpenApiInfo
-    {
-        Version = "v1",
-        Title = "Boilerplate API",
-        Description = "An ASP.NET Core Web API"
-    });
-});
+builder.Services.AddOpenApi();
 
 var app = builder.Build();
 
@@ -88,6 +80,7 @@
 // register essential things
 if (app.Environment.IsDevelopment())
 {
+    app.MapOpenApi();
     app.UseDeveloperExceptionPage();
 }
 else
@@ -100,17 +93,6 @@
 
 app.UseAuthorization();
 
-app.UseSwagger(c =>
-{
-    c.RouteTemplate = "api/docs/{documentName}/swagger.json";
-});
-
-app.UseSwaggerUI(c =>
-{
-    c.SwaggerEndpoint("/api/docs/v1/swagger.json", "My API V1");
-    c.RoutePrefix = "api/docs";
-});
-
 app.MapDefaultEndpoints();
 
 app.MapControllers();