diff --git a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Properties/launchSettings.json b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Properties/launchSettings.json
index 912842140..949ac3e8f 100644
--- a/Sample/Helpdesk.Wolverine/Helpdesk.Api/Properties/launchSettings.json
+++ b/Sample/Helpdesk.Wolverine/Helpdesk.Api/Properties/launchSettings.json
@@ -7,7 +7,7 @@
             "launchUrl": "swagger/index.html",
             "applicationUrl": "http://localhost:5248",
             "environmentVariables": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
+                "ASPNETCORE_ENVIRONMENT": "Test"
             }
         }
     }
diff --git a/Sample/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj b/Sample/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj
index dc45c96d0..9ae121c84 100644
--- a/Sample/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj
+++ b/Sample/Helpdesk/Helpdesk.Api/Helpdesk.Api.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\Core.WebApi\Core.WebApi.csproj" />
-    </ItemGroup>
+<!--    <ItemGroup>-->
+<!--      <ProjectReference Include="..\..\..\Core.WebApi\Core.WebApi.csproj" />-->
+<!--    </ItemGroup>-->
 </Project>
diff --git a/Sample/Helpdesk/Helpdesk.Api/Program.cs b/Sample/Helpdesk/Helpdesk.Api/Program.cs
index 1f9ebf78e..88ae45810 100644
--- a/Sample/Helpdesk/Helpdesk.Api/Program.cs
+++ b/Sample/Helpdesk/Helpdesk.Api/Program.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Core.WebApi.Middlewares.ExceptionHandling;
 using Helpdesk.Api.Core.Http;
 using Helpdesk.Api.Core.Kafka;
 using Helpdesk.Api.Core.Marten;
@@ -14,6 +13,7 @@
 using Marten.AspNetCore;
 using Marten.Events;
 using Marten.Events.Daemon.Resiliency;
+using Marten.Events.Projections;
 using Marten.Pagination;
 using Marten.Schema.Identity;
 using Marten.Storage;
@@ -34,8 +34,8 @@
 builder.Services
     .AddEndpointsApiExplorer()
     .AddSwaggerGen()
-    .AddDefaultExceptionHandler()
-    .AddMarten(sp =>
+    //.AddDefaultExceptionHandler()
+    .AddMarten(_ =>
     {
         var options = new StoreOptions();
 
@@ -60,11 +60,11 @@
         options.Projections.Errors.SkipSerializationErrors = false;
         options.Projections.Errors.SkipUnknownEvents = false;
 
-        // options.Projections.LiveStreamAggregation<Incident>();
-        // options.Projections.Add<IncidentHistoryTransformation>(ProjectionLifecycle.Inline);
-        // options.Projections.Add<IncidentDetailsProjection>(ProjectionLifecycle.Inline);
-        // options.Projections.Add<IncidentShortInfoProjection>(ProjectionLifecycle.Inline);
-        // options.Projections.Add<CustomerIncidentsSummaryProjection>(ProjectionLifecycle.Async);
+        options.Projections.LiveStreamAggregation<Incident>();
+        options.Projections.Add<IncidentHistoryTransformation>(ProjectionLifecycle.Inline);
+        options.Projections.Add<IncidentDetailsProjection>(ProjectionLifecycle.Inline);
+        options.Projections.Add<IncidentShortInfoProjection>(ProjectionLifecycle.Inline);
+        options.Projections.Add<CustomerIncidentsSummaryProjection>(ProjectionLifecycle.Async);
 
         options.ApplicationAssembly = typeof(CustomerIncidentsSummaryProjection).Assembly;
 
@@ -258,7 +258,8 @@ await documentSession.GetAndUpdate<Incident>(incidentId, ToExpectedVersion(eTag)
         querySession.Json.WriteById<CustomerIncidentsSummary>(customerId, context)
 );
 
-app.UseExceptionHandler().UseSwagger()
+app//.UseExceptionHandler()
+    .UseSwagger()
     .UseSwaggerUI()
     .UseForwardedHeaders(); // Header forwarding to enable Swagger in Nginx