diff --git a/src/Services/CertificateProcessing/CertificateProcessing.API/CertificateProcessing.API.csproj b/src/Services/CertificateProcessing/CertificateProcessing.API/CertificateProcessing.API.csproj
index 28847161..fe7ce1bd 100644
--- a/src/Services/CertificateProcessing/CertificateProcessing.API/CertificateProcessing.API.csproj
+++ b/src/Services/CertificateProcessing/CertificateProcessing.API/CertificateProcessing.API.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5"/>
   </ItemGroup>
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Services/Enrolling/Enrolling.API/Enrolling.API.csproj b/src/Services/Enrolling/Enrolling.API/Enrolling.API.csproj
index f8cd2318..74251347 100644
--- a/src/Services/Enrolling/Enrolling.API/Enrolling.API.csproj
+++ b/src/Services/Enrolling/Enrolling.API/Enrolling.API.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Enrolling.API</AssemblyName>
     <RootNamespace>OpenCodeFoundation.ESchool.Services.Enrolling.API</RootNamespace>
+
+    <IncludeOpenAPIAnalyzers>true</IncludeOpenAPIAnalyzers>
   </PropertyGroup>
   <ItemGroup>
     <!-- HealthChecks -->
     <PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="5.0.3"/>
     <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="5.0.1"/>
-    <PackageReference Include="HotChocolate.AspNetCore" Version="11.3.0"/>
-    <PackageReference Include="HotChocolate.Stitching" Version="11.3.0"/>
     <!-- In-memory commandbus -->
     <PackageReference Include="MediatR" Version="9.0.0"/>
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="9.0.0"/>
     <!-- For validating inputs -->
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.2.3"/>
+    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.0"/>
     <!-- Polly is a .NET resilience and transient-fault-handling library that
     allows developers to express policies such as Retry, Circuit Breaker, Timeout,
     Bulkhead Isolation, and Fallback in a fluent and thread-safe manner. -->
@@ -24,9 +24,9 @@
     <PackageReference Include="Serilog.Enrichers.Span" Version="1.2.0"/>
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.0.1"/>
     <!-- Swagger -->
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4"/>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.5"/>
     <!-- Need this package for generating migration files -->
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.6.21352.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>