diff --git a/Directory.Packages.props b/Directory.Packages.props
index b1cec0ad..7e173bfe 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -27,7 +27,7 @@
     <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.4.0" />
     <PackageVersion Include="Refit" Version="13.1.0" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="13.1.0" />
-    <PackageVersion Include="Refitter.MSBuild" Version="2.0.0" />
+    <PackageVersion Include="Refitter.SourceGenerator" Version="2.1.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
     <PackageVersion Include="Serilog.Settings.Configuration" Version="10.0.1" />
diff --git a/Integrations/MCP/ScriptBee.MCP/Generated/GatewayApi.g.cs b/Integrations/MCP/ScriptBee.MCP/Generated/GatewayApi.g.cs
index 679374d6..ce43fd67 100644
--- a/Integrations/MCP/ScriptBee.MCP/Generated/GatewayApi.g.cs
+++ b/Integrations/MCP/ScriptBee.MCP/Generated/GatewayApi.g.cs
@@ -1,5 +1,5 @@
-// <auto-generated>
-//     This code was generated by Refitter.
+// <auto-generated>
+//     This code was generated by Refitter version 2.1.0.0.
 // </auto-generated>
 
 
@@ -15,7 +15,7 @@
 namespace ScriptBee.MCP.Gateway.Generated
 {
     /// <summary>ScriptBee Gateway API</summary>
-    [System.CodeDom.Compiler.GeneratedCode("Refitter", "2.0.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("Refitter", "2.1.0.0")]
     public partial interface IGatewayApi
     {
         /// <summary>Create a new project</summary>
@@ -1056,9 +1056,9 @@ public partial interface IGatewayApi
         [Post("/api/projects/{projectId}/instances/{instanceId}/analyses")]
         Task Analyses(string projectId, string instanceId, [Body] TriggerAnalysisCommand body, CancellationToken cancellationToken = default);
 
-
     }
 
+
 }
 
 //----------------------
diff --git a/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.csproj b/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.csproj
index 72bf4e94..c6e2f368 100644
--- a/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.csproj
+++ b/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.csproj
@@ -1,8 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>ScriptBee.MCP</RootNamespace>
     <RefitterNoLogging>true</RefitterNoLogging>
   </PropertyGroup>
@@ -11,7 +8,7 @@
     <PackageReference Include="ModelContextProtocol.AspNetCore" />
     <PackageReference Include="Refit" />
     <PackageReference Include="Refit.HttpClientFactory" />
-    <PackageReference Include="Refitter.MSBuild" />
+    <PackageReference Include="Refitter.SourceGenerator" />
     <PackageReference Include="Serilog.AspNetCore" />
   </ItemGroup>
 
diff --git a/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.refitter b/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.refitter
index 47fc5b6b..3d446dad 100644
--- a/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.refitter
+++ b/Integrations/MCP/ScriptBee.MCP/ScriptBee.MCP.refitter
@@ -13,7 +13,6 @@
   "immutableRecords": false,
   "generateNullableReferenceTypes": true,
   "generateNativeRecords": false,
-  "outputFolder": "./Generated",
   "outputFilename": "GatewayApi.g.cs",
   "responseTypeOverride": {
     "GetScriptContent": "string",
diff --git a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Generated/AnalysisApi.g.cs b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Generated/AnalysisApi.g.cs
index 99216487..b44daf85 100644
--- a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Generated/AnalysisApi.g.cs
+++ b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Generated/AnalysisApi.g.cs
@@ -1,5 +1,5 @@
-// <auto-generated>
-//     This code was generated by Refitter.
+// <auto-generated>
+//     This code was generated by Refitter version 2.1.0.0.
 // </auto-generated>
 
 
@@ -15,7 +15,7 @@
 namespace ScriptBee.Rest.Api.Generated
 {
     /// <summary>ScriptBee Analysis API</summary>
-    [System.CodeDom.Compiler.GeneratedCode("Refitter", "2.0.0.0")]
+    [System.CodeDom.Compiler.GeneratedCode("Refitter", "2.1.0.0")]
     public partial interface IAnalysisApi
     {
         /// <summary>Get installed plugins</summary>
@@ -178,9 +178,9 @@ public partial interface IAnalysisApi
         [Post("/api/analyses")]
         Task<ScriptBee.Rest.Api.Generated.Contracts.RunAnalysisResponse> Analyses([Body] RunAnalysisCommand body, CancellationToken cancellationToken = default);
 
-
     }
 
+
 }
 
 //----------------------
diff --git a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Rest.csproj b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Rest.csproj
index 8f9f7346..2e7d43a0 100644
--- a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Rest.csproj
+++ b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/Rest.csproj
@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="Refit" />
-    <PackageReference Include="Refitter.MSBuild" />
+    <PackageReference Include="Refitter.SourceGenerator" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Application\Ports.Instance\Ports.Instance.csproj" />
diff --git a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/analysis.refitter b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/analysis.refitter
index fb000087..7989e508 100644
--- a/ScriptBeeWebApp/src/Gateway/Adapters/Rest/analysis.refitter
+++ b/ScriptBeeWebApp/src/Gateway/Adapters/Rest/analysis.refitter
@@ -13,7 +13,6 @@
   "immutableRecords": true,
   "generateNullableReferenceTypes": true,
   "generateNativeRecords": true,
-  "outputFolder": "./Generated",
   "outputFilename": "AnalysisApi.g.cs",
   "responseTypeOverride": {
     "GenerateClasses": "System.IO.Stream",