diff --git a/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs b/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs
index cf7f870d..e12af99e 100644
--- a/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs
+++ b/EnvelopeGenerator.DependencyInjection/DependencyInjection.cs
@@ -38,6 +38,7 @@ public static class DependencyInjection
                 _serviceRegs.Dequeue().Invoke(services);
         }
 
+        // TODO: update to use attributes and reflections instead of _addingStatus-dictionary
         private readonly Dictionary<string, bool> _addingStatus = new ()
         {
             { nameof(AddLocalization), false },
diff --git a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
index 091c4636..a35188e7 100644
--- a/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
+++ b/EnvelopeGenerator.Finalizer/EnvelopeGenerator.Finalizer.csproj
@@ -18,6 +18,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\EnvelopeGenerator.Application\EnvelopeGenerator.Application.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.DependencyInjection\EnvelopeGenerator.DependencyInjection.csproj" />
     <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
   </ItemGroup>
 </Project>
diff --git a/EnvelopeGenerator.Finalizer/Program.cs b/EnvelopeGenerator.Finalizer/Program.cs
index 7bda308b..aa9d0b27 100644
--- a/EnvelopeGenerator.Finalizer/Program.cs
+++ b/EnvelopeGenerator.Finalizer/Program.cs
@@ -1,4 +1,4 @@
-using EnvelopeGenerator.Application;
+using EnvelopeGenerator.DependencyInjection;
 using EnvelopeGenerator.Finalizer;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.EntityFrameworkCore;
@@ -27,25 +27,28 @@ try
     var connStr = config.GetConnectionString(cnnStrName)
         ?? throw new InvalidOperationException($"Connection string '{cnnStrName}' is missing in the application configuration.");
 
-    #pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddEGInfrastructureServices(
-        opt =>
+    builder.Services.AddEnvelopeGenerator(egOptions => egOptions
+        .AddLocalization()
+        .AddDistributedSqlServerCache(options =>
+        {
+            options.ConnectionString = connStr;
+            options.SchemaName = "dbo";
+            options.TableName = "TBDD_CACHE";
+        })
+        .AddInfrastructure(opt =>
         {
             opt.AddDbTriggerParams(config);
             opt.AddDbContext((provider, options) =>
             {
                 var logger = provider.GetRequiredService<ILogger<EGDbContext>>();
                 options.UseSqlServer(connStr)
-                        .LogTo(log => logger.LogInformation("{log}", log), Microsoft.Extensions.Logging.LogLevel.Trace)
+                        .LogTo(log => logger.LogInformation("{log}", log), LogLevel.Trace)
                         .EnableSensitiveDataLogging()
                         .EnableDetailedErrors();
             });
-        });
-    #pragma warning restore CS0618 // Type or member is obsolete
-
-    #pragma warning disable CS0618 // Type or member is obsolete
-    builder.Services.AddEnvelopeGeneratorServices(config);
-    #pragma warning restore CS0618 // Type or member is obsolete
+        })
+        .AddServices(config)
+    );
     #endregion  Add DB Context, EG Inf. and Services
 
     var host = builder.Build();
diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs
index 3813ede4..a540b4e3 100644
--- a/EnvelopeGenerator.GeneratorAPI/Program.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Program.cs
@@ -105,6 +105,7 @@ try
     });
     builder.Services.AddOpenApi();
 
+    // TODO: Update to configure with EnvelopeGenerator.DependencyInjection
     //AddEF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index 91aaa99c..810a6121 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -86,6 +86,7 @@ try
         builder.Services.AddSwaggerGen();
     }
 
+    // TODO: Update to configure with EnvelopeGenerator.DependencyInjection
     //AddEF Core dbcontext
     var useDbMigration = Environment.GetEnvironmentVariable("MIGRATION_TEST_MODE") == true.ToString() || config.GetValue<bool>("UseDbMigration");
     var cnnStrName = useDbMigration ? "DbMigrationTest" : "Default";