diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile
index ba6142f0..1bcc04e6 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Dockerfile
@@ -1,10 +1,10 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
 COPY ["O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj", "O2NextGen.OnTracker.Api/"]
 COPY ["O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj", "O2NextGen.OnTracker.Business/"]
@@ -17,7 +17,7 @@ WORKDIR "/src/O2NextGen.OnTracker.Api"
 RUN dotnet build "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/build
 
 FROM build AS publish
-RUN dotnet publish "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/publish
+RUN dotnet publish "O2NextGen.OnTracker.Api.csproj" -c Release -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
index 896b97db..0a30912c 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DockerComposeProjectPath>../docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
@@ -13,8 +13,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.4.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
index f208d303..dbc15171 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Business/O2NextGen.OnTracker.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
index f208d303..dbc15171 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Data/O2NextGen.OnTracker.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
index f208d303..dbc15171 100644
--- a/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
+++ b/src/Services/on-tracker/O2NextGen.OnTracker.Impl/O2NextGen.OnTracker.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
index cccdc0e2..36b38322 100644
--- a/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
+++ b/src/Services/on-tracker/O2NextGen.Tracker.DbUtility/O2NextGen.Tracker.DbUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
index e804290d..0db5b5f9 100644
--- a/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/Tests/IntegrationTests.O2NextGen.OnTracker.Api/IntegrationTests.O2NextGen.OnTracker.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
index 8836b31f..2a066c77 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Api/Tests.O2NextGen.OnTracker.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
index 8836b31f..2a066c77 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Business/Tests.O2NextGen.OnTracker.Business.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
index 8836b31f..2a066c77 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Data/Tests.O2NextGen.OnTracker.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
index 8836b31f..2a066c77 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.OnTracker.Impl/Tests.O2NextGen.OnTracker.Impl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
index 8836b31f..2a066c77 100644
--- a/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
+++ b/src/Services/on-tracker/Tests/Tests.O2NextGen.Tracker.DbUtility/Tests.O2NextGen.Tracker.DbUtility.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>