diff --git a/PARR.AIHITLoaderWorker/Dockerfile b/PARR.AIHITLoaderWorker/Dockerfile
index c12cb12a..87ff4dd2 100644
--- a/PARR.AIHITLoaderWorker/Dockerfile
+++ b/PARR.AIHITLoaderWorker/Dockerfile
@@ -8,10 +8,12 @@ ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["NuGet.config", "."]
 COPY ["PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj", "PARR.AIHITLoaderWorker/"]
-COPY ["PARR.AIHITLoader/PARR.AIHITLoader.csproj", "PARR.AIHITLoader/"]
 COPY ["PARR.AIHITMainLoader/PARR.AIHITMainLoader.csproj", "PARR.AIHITMainLoader/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
+COPY ["PARR.Infrastructure/PARR.Infrastructure.csproj", "PARR.Infrastructure/"]
 RUN dotnet restore "./PARR.AIHITLoaderWorker/./PARR.AIHITLoaderWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.AIHITLoaderWorker"
diff --git a/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj b/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj
index 61fa09c4..4041ff50 100644
--- a/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj
+++ b/PARR.AIHITLoaderWorker/PARR.AIHITLoaderWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.AIHITMainLoader/AihitMainLoaderInstaller.cs b/PARR.AIHITMainLoader/AihitMainLoaderInstaller.cs
index 43028fba..63c72e72 100644
--- a/PARR.AIHITMainLoader/AihitMainLoaderInstaller.cs
+++ b/PARR.AIHITMainLoader/AihitMainLoaderInstaller.cs
@@ -5,6 +5,8 @@ using PARR.AIHITMainLoader.Context;
 using PARR.AIHITMainLoader.Services;
 using PARR.AIHITMainLoader.Settings;
 using PARR.BLL;
+using PARR.Core;
+using PARR.Infrastructure;
 
 namespace PARR.AIHITMainLoader
 {
@@ -13,6 +15,8 @@ namespace PARR.AIHITMainLoader
         public static void InstallAihitMainLoaderServices(this IServiceCollection services, IConfiguration configuration)
         {
             services.InstallBllServices(configuration);
+            services.AddCoreServices(configuration);
+            services.AddInfrastructureServices(configuration);
 
             var settings = new WorkerSettings();
             configuration.GetSection(nameof(WorkerSettings)).Bind(settings);
diff --git a/PARR.AIHITRelationshipsSyncer/AihitRelationshpsSyncerInstaller.cs b/PARR.AIHITRelationshipsSyncer/AihitRelationshpsSyncerInstaller.cs
index 60afd7ed..bd1f48a1 100644
--- a/PARR.AIHITRelationshipsSyncer/AihitRelationshpsSyncerInstaller.cs
+++ b/PARR.AIHITRelationshipsSyncer/AihitRelationshpsSyncerInstaller.cs
@@ -6,6 +6,7 @@ using PARR.AIHITRelationshipsSyncer.Services.Implementations;
 using PARR.AIHITRelationshipsSyncer.Services.Interfaces;
 using PARR.AIHITRelationshipsSyncer.Settings;
 using PARR.BLL;
+using PARR.Core;
 using PARR.DAL;
 
 namespace PARR.AIHITRelationshipsSyncer
@@ -15,6 +16,7 @@ namespace PARR.AIHITRelationshipsSyncer
         public static void InstallAihitRelationshpsSyncerServices(this IServiceCollection services, IConfiguration configuration)
         {
             services.InstallBllServices(configuration);
+            services.AddCoreServices(configuration);
             services.InstallDalServices(configuration);
 
             var settings = new WorkerSettings();
diff --git a/PARR.AIHITRelationshipsSyncerWorker/Dockerfile b/PARR.AIHITRelationshipsSyncerWorker/Dockerfile
index 93a6e426..9930beb6 100644
--- a/PARR.AIHITRelationshipsSyncerWorker/Dockerfile
+++ b/PARR.AIHITRelationshipsSyncerWorker/Dockerfile
@@ -14,8 +14,9 @@ COPY ["PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.c
 COPY ["PARR.AIHITRelationshipsSyncer/PARR.AIHITRelationshipsSyncer.csproj", "PARR.AIHITRelationshipsSyncer/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.AIHITRelationshipsSyncerWorker/PARR.AIHITRelationshipsSyncerWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.AIHITRelationshipsSyncerWorker"
diff --git a/PARR.AIHITSyncerWorker/Dockerfile b/PARR.AIHITSyncerWorker/Dockerfile
index dfdedf3d..a9847f80 100644
--- a/PARR.AIHITSyncerWorker/Dockerfile
+++ b/PARR.AIHITSyncerWorker/Dockerfile
@@ -8,12 +8,12 @@ ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["NuGet.config", "."]
 COPY ["PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj", "PARR.AIHITSyncerWorker/"]
-COPY ["PARR.AIHITSyncer/PARR.AIHITSyncer.csproj", "PARR.AIHITSyncer/"]
 COPY ["PARR.AIHITMainSyncer/PARR.AIHITMainSyncer.csproj", "PARR.AIHITMainSyncer/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.AIHITSyncerWorker/./PARR.AIHITSyncerWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.AIHITSyncerWorker"
diff --git a/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj b/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj
index f6547c90..63944223 100644
--- a/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj
+++ b/PARR.AIHITSyncerWorker/PARR.AIHITSyncerWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.API/Dockerfile b/PARR.API/Dockerfile
index 760268b3..1fcb2297 100644
--- a/PARR.API/Dockerfile
+++ b/PARR.API/Dockerfile
@@ -15,11 +15,12 @@ FROM 10.99.253.167:8090/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["NuGet.config", "."]
 COPY ["PARR.API/PARR.API.csproj", "PARR.API/"]
-COPY ["CHANGELOG.md", "PARR.API/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Infrastructure/PARR.Infrastructure.csproj", "PARR.Infrastructure/"]
 RUN dotnet restore "PARR.API/PARR.API.csproj"
 COPY . .
 WORKDIR "/src/PARR.API"
diff --git a/PARR.API/PARR.API.csproj b/PARR.API/PARR.API.csproj
index 33f4068a..69357422 100644
--- a/PARR.API/PARR.API.csproj
+++ b/PARR.API/PARR.API.csproj
@@ -26,6 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.API/Program.cs b/PARR.API/Program.cs
index 4961ac2b..25531d08 100644
--- a/PARR.API/Program.cs
+++ b/PARR.API/Program.cs
@@ -24,8 +24,10 @@ builder.Host.UseSerilog((context, config) =>
 
 // Add services to the container.
 builder.Services.InstallDalServices(builder.Configuration);
+//---- new ----
 builder.Services.AddCoreServices(builder.Configuration);
 builder.Services.AddInfrastructureServices(builder.Configuration);
+//---- --- ----
 builder.Services.InstallBllServices(builder.Configuration);
 builder.Services.InstallApiServices(builder.Configuration);
 builder.Services.InstallSettings(builder.Configuration);
diff --git a/PARR.EsppOrderLoaderWorker/Dockerfile b/PARR.EsppOrderLoaderWorker/Dockerfile
index ff95d5b3..1602f060 100644
--- a/PARR.EsppOrderLoaderWorker/Dockerfile
+++ b/PARR.EsppOrderLoaderWorker/Dockerfile
@@ -9,10 +9,11 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj", "PARR.EsppOrderLoaderWorker/"]
 COPY ["PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj", "PARR.EsppOrderLoader/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
+COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
 RUN dotnet restore "PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppOrderLoaderWorker"
diff --git a/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj b/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj
index e51a9435..7086fc23 100644
--- a/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj
+++ b/PARR.EsppOrderLoaderWorker/PARR.EsppOrderLoaderWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.EsppOrderManagerWorker/Dockerfile b/PARR.EsppOrderManagerWorker/Dockerfile
index f2765aeb..1913d3e7 100644
--- a/PARR.EsppOrderManagerWorker/Dockerfile
+++ b/PARR.EsppOrderManagerWorker/Dockerfile
@@ -9,10 +9,11 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj", "PARR.EsppOrderManagerWorker/"]
 COPY ["PARR.EsppOrderManager/PARR.EsppOrderManager.csproj", "PARR.EsppOrderManager/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
+COPY ["PARR.EsppApi/PARR.EsppApi.csproj", "PARR.EsppApi/"]
 RUN dotnet restore "PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppOrderManagerWorker"
diff --git a/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj b/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj
index a0a521d0..20eb6b2f 100644
--- a/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj
+++ b/PARR.EsppOrderManagerWorker/PARR.EsppOrderManagerWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.EsppScheduleSyncWorker/Dockerfile b/PARR.EsppScheduleSyncWorker/Dockerfile
index 1d729cb5..b2712905 100644
--- a/PARR.EsppScheduleSyncWorker/Dockerfile
+++ b/PARR.EsppScheduleSyncWorker/Dockerfile
@@ -9,9 +9,10 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj", "PARR.EsppScheduleSyncWorker/"]
 COPY ["PARR.EsppScheduleSync/PARR.EsppScheduleSync.csproj", "PARR.EsppScheduleSync/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 COPY ["PARR.EsppSync/PARR.EsppSync.csproj", "PARR.EsppSync/"]
 RUN dotnet restore "PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj"
 COPY . .
diff --git a/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj b/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj
index 808ca915..0e363f7b 100644
--- a/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj
+++ b/PARR.EsppScheduleSyncWorker/PARR.EsppScheduleSyncWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.EsppTemplateSyncWorker/Dockerfile b/PARR.EsppTemplateSyncWorker/Dockerfile
index d93046f4..76e62728 100644
--- a/PARR.EsppTemplateSyncWorker/Dockerfile
+++ b/PARR.EsppTemplateSyncWorker/Dockerfile
@@ -9,9 +9,11 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj", "PARR.EsppTemplateSyncWorker/"]
 COPY ["PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj", "PARR.EsppTemplateSync/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
+COPY ["PARR.EsppSync/PARR.EsppSync.csproj", "PARR.EsppSync/"]
 RUN dotnet restore "PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.EsppTemplateSyncWorker"
diff --git a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj
index 19a22bd3..4bde810e 100644
--- a/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj
+++ b/PARR.EsppTemplateSyncWorker/PARR.EsppTemplateSyncWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.JobAutoControlWorker/Dockerfile b/PARR.JobAutoControlWorker/Dockerfile
index a86e24bd..9d5057e3 100644
--- a/PARR.JobAutoControlWorker/Dockerfile
+++ b/PARR.JobAutoControlWorker/Dockerfile
@@ -14,8 +14,9 @@ COPY ["PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj", "PARR.JobAut
 COPY ["PARR.JobAutoControl/PARR.JobAutoControl.csproj", "PARR.JobAutoControl/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.JobAutoControlWorker/PARR.JobAutoControlWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.JobAutoControlWorker"
diff --git a/PARR.MasterWorker/Dockerfile b/PARR.MasterWorker/Dockerfile
index 4ffa0aa5..1b83a507 100644
--- a/PARR.MasterWorker/Dockerfile
+++ b/PARR.MasterWorker/Dockerfile
@@ -9,9 +9,10 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.MasterWorker/PARR.MasterWorker.csproj", "PARR.MasterWorker/"]
 COPY ["PARR.Master/PARR.Master.csproj", "PARR.Master/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "PARR.MasterWorker/PARR.MasterWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.MasterWorker"
diff --git a/PARR.MasterWorker/PARR.MasterWorker.csproj b/PARR.MasterWorker/PARR.MasterWorker.csproj
index bc60f561..0ce2b50f 100644
--- a/PARR.MasterWorker/PARR.MasterWorker.csproj
+++ b/PARR.MasterWorker/PARR.MasterWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.NextRunWorker/Dockerfile b/PARR.NextRunWorker/Dockerfile
index 31e6a11f..64b231ef 100644
--- a/PARR.NextRunWorker/Dockerfile
+++ b/PARR.NextRunWorker/Dockerfile
@@ -10,9 +10,10 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.NextRunWorker/PARR.NextRunWorker.csproj", "PARR.NextRunWorker/"]
 COPY ["PARR.NextRun/PARR.NextRun.csproj", "PARR.NextRun/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.NextRunWorker/./PARR.NextRunWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.NextRunWorker"
diff --git a/PARR.NextRunWorker/PARR.NextRunWorker.csproj b/PARR.NextRunWorker/PARR.NextRunWorker.csproj
index 92c0622f..c8e32ab2 100644
--- a/PARR.NextRunWorker/PARR.NextRunWorker.csproj
+++ b/PARR.NextRunWorker/PARR.NextRunWorker.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.6.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/PARR.TemplateActivatorWorker/Dockerfile b/PARR.TemplateActivatorWorker/Dockerfile
index 838054e5..3e3324a5 100644
--- a/PARR.TemplateActivatorWorker/Dockerfile
+++ b/PARR.TemplateActivatorWorker/Dockerfile
@@ -10,9 +10,10 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj", "PARR.TemplateActivatorWorker/"]
 COPY ["PARR.TemplateActivator/PARR.TemplateActivator.csproj", "PARR.TemplateActivator/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.TemplateActivatorWorker/PARR.TemplateActivatorWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.TemplateActivatorWorker"
diff --git a/PARR.TemplateDistributorWorker/Dockerfile b/PARR.TemplateDistributorWorker/Dockerfile
index d08e6fa0..57c23d39 100644
--- a/PARR.TemplateDistributorWorker/Dockerfile
+++ b/PARR.TemplateDistributorWorker/Dockerfile
@@ -10,9 +10,10 @@ COPY ["NuGet.config", "."]
 COPY ["PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj", "PARR.TemplateDistributorWorker/"]
 COPY ["PARR.TemplateDistributor/PARR.TemplateDistributor.csproj", "PARR.TemplateDistributor/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.TemplateDistributorWorker/PARR.TemplateDistributorWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.TemplateDistributorWorker"
diff --git a/PARR.TemplateGeneratorWorker/Dockerfile b/PARR.TemplateGeneratorWorker/Dockerfile
index eb1bacc1..f080229a 100644
--- a/PARR.TemplateGeneratorWorker/Dockerfile
+++ b/PARR.TemplateGeneratorWorker/Dockerfile
@@ -11,6 +11,11 @@ ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["NuGet.config", "."]
 COPY ["PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj", "PARR.TemplateGeneratorWorker/"]
+COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
+COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
+COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.TemplateGeneratorWorker/PARR.TemplateGeneratorWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.TemplateGeneratorWorker"
diff --git a/PARR.TemplateMatcherWorker/Dockerfile b/PARR.TemplateMatcherWorker/Dockerfile
index 6920b10e..004b8e2e 100644
--- a/PARR.TemplateMatcherWorker/Dockerfile
+++ b/PARR.TemplateMatcherWorker/Dockerfile
@@ -14,8 +14,9 @@ COPY ["PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj", "PARR.Temp
 COPY ["PARR.TemplateMatcher/PARR.TemplateMatcher.csproj", "PARR.TemplateMatcher/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.TemplateMatcherWorker/PARR.TemplateMatcherWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.TemplateMatcherWorker"
diff --git a/PARR.TemplateUpdaterWorker/Dockerfile b/PARR.TemplateUpdaterWorker/Dockerfile
index 635ad3ab..c896e43a 100644
--- a/PARR.TemplateUpdaterWorker/Dockerfile
+++ b/PARR.TemplateUpdaterWorker/Dockerfile
@@ -14,8 +14,9 @@ COPY ["PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj", "PARR.Temp
 COPY ["PARR.TemplateUpdater/PARR.TemplateUpdater.csproj", "PARR.TemplateUpdater/"]
 COPY ["PARR.BLL/PARR.BLL.csproj", "PARR.BLL/"]
 COPY ["PARR.Common/PARR.Common.csproj", "PARR.Common/"]
-COPY ["PARR.Constants/PARR.Constants.csproj", "PARR.Constants/"]
+COPY ["PARR.Domain/PARR.Domain.csproj", "PARR.Domain/"]
 COPY ["PARR.DAL/PARR.DAL.csproj", "PARR.DAL/"]
+COPY ["PARR.Core/PARR.Core.csproj", "PARR.Core/"]
 RUN dotnet restore "./PARR.TemplateUpdaterWorker/PARR.TemplateUpdaterWorker.csproj"
 COPY . .
 WORKDIR "/src/PARR.TemplateUpdaterWorker"