diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs
index 6ba72940..1d2c3522 100644
--- a/EnvelopeGenerator.GeneratorAPI/Program.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Program.cs
@@ -10,11 +10,14 @@ using Microsoft.OpenApi.Models;
 using DigitalData.UserManager.DependencyInjection;
 using EnvelopeGenerator.Application;
 using DigitalData.Auth.Client;
+using DigitalData.Core.Abstractions;
 
 var builder = WebApplication.CreateBuilder(args);
 
 var config = builder.Configuration;
 
+var deferredProvider = new DeferredServiceProvider();
+
 builder.Services.AddControllers();
 
 //CORS Policy
@@ -116,6 +119,8 @@ builder.Services
 
 var app = builder.Build();
 
+deferredProvider.Factory = () => app.Services;
+
 app.MapOpenApi();
 
 // Configure the HTTP request pipeline.