diff --git a/.github/workflows/.net-build-modularmonolith.yml b/.github/workflows/.net-build-modularmonolith.yml
index 46044a62a..143edd1cb 100644
--- a/.github/workflows/.net-build-modularmonolith.yml
+++ b/.github/workflows/.net-build-modularmonolith.yml
@@ -30,8 +30,8 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release 
     
-    - name: Publish ClassifiedAds.BackgroundServer
-      run: dotnet publish ClassifiedAds.BackgroundServer/*.csproj --configuration Release
+    - name: Publish ClassifiedAds.Background
+      run: dotnet publish ClassifiedAds.Background/*.csproj --configuration Release
 
     - name: Publish ClassifiedAds.Migrator
       run: dotnet publish ClassifiedAds.Migrator/*.csproj --configuration Release
@@ -39,11 +39,11 @@ jobs:
     - name: Publish ClassifiedAds.WebAPI
       run: dotnet publish ClassifiedAds.WebAPI/*.csproj --configuration Release
       
-    - name: Upload ClassifiedAds.BackgroundServer
+    - name: Upload ClassifiedAds.Background
       uses: actions/upload-artifact@v4
       with:
-        name: ClassifiedAds.BackgroundServer
-        path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net8.0/publish
+        name: ClassifiedAds.Background
+        path: src/ModularMonolith/ClassifiedAds.Background/bin/Release/net8.0/publish
 
     - name: Upload ClassifiedAds.Migrator
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/.net-build-monolith.yml b/.github/workflows/.net-build-monolith.yml
index c8578a916..57032ddaa 100644
--- a/.github/workflows/.net-build-monolith.yml
+++ b/.github/workflows/.net-build-monolith.yml
@@ -30,8 +30,8 @@ jobs:
     - name: Build
       run: dotnet build --configuration Release 
     
-    - name: Publish ClassifiedAds.BackgroundServer
-      run: dotnet publish ClassifiedAds.BackgroundServer/*.csproj --configuration Release
+    - name: Publish ClassifiedAds.Background
+      run: dotnet publish ClassifiedAds.Background/*.csproj --configuration Release
  
     - name: Publish ClassifiedAds.GraphQL
       run: dotnet publish ClassifiedAds.GraphQL/*.csproj --configuration Release
@@ -51,11 +51,11 @@ jobs:
     - name: Publish ClassifiedAds.BlazorWebAssembly
       run: dotnet publish ClassifiedAds.BlazorWebAssembly/*.csproj --configuration Release
       
-    - name: Upload ClassifiedAds.BackgroundServer
+    - name: Upload ClassifiedAds.Background
       uses: actions/upload-artifact@v4
       with:
-        name: ClassifiedAds.BackgroundServer
-        path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net8.0/publish
+        name: ClassifiedAds.Background
+        path: src/Monolith/ClassifiedAds.Background/bin/Release/net8.0/publish
         
     - name: Upload ClassifiedAds.GraphQL
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/docker-build-modularmonolith.yml b/.github/workflows/docker-build-modularmonolith.yml
index e4e9185e2..a998a342d 100644
--- a/.github/workflows/docker-build-modularmonolith.yml
+++ b/.github/workflows/docker-build-modularmonolith.yml
@@ -40,12 +40,12 @@ jobs:
           
           echo VERSION=$VERSION
           
-          docker tag classifiedads.modularmonolith.backgroundserver $REPO_NAME/classifiedads.modularmonolith.backgroundserver:$VERSION
+          docker tag classifiedads.modularmonolith.background $REPO_NAME/classifiedads.modularmonolith.background:$VERSION
           docker tag classifiedads.modularmonolith.migrator $REPO_NAME/classifiedads.modularmonolith.migrator:$VERSION
           docker tag classifiedads.modularmonolith.webapi $REPO_NAME/classifiedads.modularmonolith.webapi:$VERSION
           docker tag classifiedads.modularmonolith.identityserver $REPO_NAME/classifiedads.modularmonolith.identityserver:$VERSION
           
-          docker push $REPO_NAME/classifiedads.modularmonolith.backgroundserver:$VERSION
+          docker push $REPO_NAME/classifiedads.modularmonolith.background:$VERSION
           docker push $REPO_NAME/classifiedads.modularmonolith.migrator:$VERSION
           docker push $REPO_NAME/classifiedads.modularmonolith.webapi:$VERSION
           docker push $REPO_NAME/classifiedads.modularmonolith.identityserver:$VERSION
diff --git a/.github/workflows/docker-build-monolith.yml b/.github/workflows/docker-build-monolith.yml
index 3c4a83251..fb2119f85 100644
--- a/.github/workflows/docker-build-monolith.yml
+++ b/.github/workflows/docker-build-monolith.yml
@@ -40,7 +40,7 @@ jobs:
           
           echo VERSION=$VERSION
           
-          docker tag classifiedads.backgroundserver $REPO_NAME/classifiedads.backgroundserver:$VERSION
+          docker tag classifiedads.background $REPO_NAME/classifiedads.background:$VERSION
           docker tag classifiedads.migrator $REPO_NAME/classifiedads.migrator:$VERSION
           docker tag classifiedads.webapi $REPO_NAME/classifiedads.webapi:$VERSION
           docker tag classifiedads.graphql $REPO_NAME/classifiedads.graphql:$VERSION
@@ -48,7 +48,7 @@ jobs:
           docker tag classifiedads.identityserver $REPO_NAME/classifiedads.identityserver:$VERSION
           docker tag classifiedads.webmvc $REPO_NAME/classifiedads.webmvc:$VERSION
           
-          docker push $REPO_NAME/classifiedads.backgroundserver:$VERSION
+          docker push $REPO_NAME/classifiedads.background:$VERSION
           docker push $REPO_NAME/classifiedads.migrator:$VERSION
           docker push $REPO_NAME/classifiedads.webapi:$VERSION
           docker push $REPO_NAME/classifiedads.graphql:$VERSION
diff --git a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/Chart.yaml b/src/ModularMonolith/.helm/modularmonolith/charts/background/Chart.yaml
similarity index 67%
rename from src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/Chart.yaml
rename to src/ModularMonolith/.helm/modularmonolith/charts/background/Chart.yaml
index d75a63f6f..db153c277 100644
--- a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/Chart.yaml
+++ b/src/ModularMonolith/.helm/modularmonolith/charts/background/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
-name: backgroundserver
+name: background
 version: 1.0.0
 type: application
\ No newline at end of file
diff --git a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml b/src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.deployment.yaml
similarity index 72%
rename from src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml
rename to src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.deployment.yaml
index 3358ab778..9c13bac2b 100644
--- a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml
+++ b/src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.deployment.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: {{ .Release.Name}}-backgroundserver
-  name: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
+  name: {{ .Release.Name}}-background
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: {{ .Release.Name}}-backgroundserver
+      app: {{ .Release.Name}}-background
   strategy: {}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name}}-backgroundserver
+        app: {{ .Release.Name}}-background
     spec:
       containers:
       - env:
@@ -24,8 +24,8 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ .Release.Name}}-shared
-        image: phongnguyend/classifiedads.modularmonolith.backgroundserver
-        name: {{ .Release.Name}}-backgroundserver
+        image: phongnguyend/classifiedads.modularmonolith.background
+        name: {{ .Release.Name}}-background
         ports:
         - containerPort: 80
         resources: {}
diff --git a/src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.service.yaml b/src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.service.yaml
similarity index 52%
rename from src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.service.yaml
rename to src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.service.yaml
index 220c387bc..c8c5aeb22 100644
--- a/src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.service.yaml
+++ b/src/ModularMonolith/.helm/modularmonolith/charts/background/templates/background.service.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: {{ .Release.Name}}-backgroundserver
-  name: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
+  name: {{ .Release.Name}}-background
 spec:
   ports:
   - name: "80"
     port: 80
     targetPort: 80
   selector:
-    app: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
 status:
   loadBalancer: {}
diff --git a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/values.yaml b/src/ModularMonolith/.helm/modularmonolith/charts/background/values.yaml
similarity index 100%
rename from src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/values.yaml
rename to src/ModularMonolith/.helm/modularmonolith/charts/background/values.yaml
diff --git a/src/ModularMonolith/.k8s/backgroundserver.deployment.yaml b/src/ModularMonolith/.k8s/background.deployment.yaml
similarity index 79%
rename from src/ModularMonolith/.k8s/backgroundserver.deployment.yaml
rename to src/ModularMonolith/.k8s/background.deployment.yaml
index 61249ec6b..8cbd65abe 100644
--- a/src/ModularMonolith/.k8s/backgroundserver.deployment.yaml
+++ b/src/ModularMonolith/.k8s/background.deployment.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: backgroundserver
-  name: backgroundserver
+    app: background
+  name: background
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: backgroundserver
+      app: background
   strategy: {}
   template:
     metadata:
       labels:
-        app: backgroundserver
+        app: background
     spec:
       containers:
       - env:
@@ -24,8 +24,8 @@ spec:
         envFrom:
         - configMapRef:
             name: shared
-        image: phongnguyend/classifiedads.modularmonolith.backgroundserver
-        name: backgroundserver
+        image: phongnguyend/classifiedads.modularmonolith.background
+        name: background
         ports:
         - containerPort: 80
         resources: {}
diff --git a/src/ModularMonolith/.k8s/backgroundserver.service.yaml b/src/ModularMonolith/.k8s/background.service.yaml
similarity index 66%
rename from src/ModularMonolith/.k8s/backgroundserver.service.yaml
rename to src/ModularMonolith/.k8s/background.service.yaml
index f394626c9..b8529ca50 100644
--- a/src/ModularMonolith/.k8s/backgroundserver.service.yaml
+++ b/src/ModularMonolith/.k8s/background.service.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: backgroundserver
-  name: backgroundserver
+    app: background
+  name: background
 spec:
   ports:
   - name: "80"
     port: 80
     targetPort: 80
   selector:
-    app: backgroundserver
+    app: background
 status:
   loadBalancer: {}
diff --git a/src/ModularMonolith/.vscode/launch.json b/src/ModularMonolith/.vscode/launch.json
index a92ad2883..2ff69e452 100644
--- a/src/ModularMonolith/.vscode/launch.json
+++ b/src/ModularMonolith/.vscode/launch.json
@@ -5,13 +5,13 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "ClassifiedAds.BackgroundServer",
+            "name": "ClassifiedAds.Background",
             "type": "coreclr",
             "request": "launch",
             //"preLaunchTask": "build",
-            "program": "${workspaceFolder}/ClassifiedAds.BackgroundServer/bin/Debug/net6.0/ClassifiedAds.BackgroundServer.dll",
+            "program": "${workspaceFolder}/ClassifiedAds.Background/bin/Debug/net6.0/ClassifiedAds.Background.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/ClassifiedAds.BackgroundServer",
+            "cwd": "${workspaceFolder}/ClassifiedAds.Background",
             "stopAtEntry": false,
             "console": "internalConsole",
             "env": {
@@ -90,7 +90,7 @@
     "compounds": [
         {
             "name": "ClassifiedAds.ModularMonolith",
-            "configurations": ["ClassifiedAds.BackgroundServer", "ClassifiedAds.Migrator", "ClassifiedAds.WebAPI", "ClassifiedAds.IdentityServer"]
+            "configurations": ["ClassifiedAds.Background", "ClassifiedAds.Migrator", "ClassifiedAds.WebAPI", "ClassifiedAds.IdentityServer"]
         }
     ]
 }
\ No newline at end of file
diff --git a/src/ModularMonolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj b/src/ModularMonolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
index 881c0f28a..56d8627bc 100644
--- a/src/ModularMonolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
+++ b/src/ModularMonolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ClassifiedAds.BackgroundServer\ClassifiedAds.BackgroundServer.csproj" />
+    <ProjectReference Include="..\ClassifiedAds.Background\ClassifiedAds.Background.csproj" />
     <ProjectReference Include="..\ClassifiedAds.Migrator\ClassifiedAds.Migrator.csproj" />
     <ProjectReference Include="..\ClassifiedAds.WebAPI\ClassifiedAds.WebAPI.csproj" />
   </ItemGroup>
diff --git a/src/ModularMonolith/ClassifiedAds.AspireAppHost/Program.cs b/src/ModularMonolith/ClassifiedAds.AspireAppHost/Program.cs
index 4c4602226..169d94d12 100644
--- a/src/ModularMonolith/ClassifiedAds.AspireAppHost/Program.cs
+++ b/src/ModularMonolith/ClassifiedAds.AspireAppHost/Program.cs
@@ -1,7 +1,7 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var migrator = builder.AddProject<Projects.ClassifiedAds_Migrator>("ClassifiedAds-Migrator");
-var background = builder.AddProject<Projects.ClassifiedAds_BackgroundServer>("ClassifiedAds-BackgroundServer");
+var background = builder.AddProject<Projects.ClassifiedAds_Background>("ClassifiedAds-Background");
 var webApi = builder.AddProject<Projects.ClassifiedAds_WebAPI>("ClassifiedAds-WebAPI");
 
 var identityServer = builder
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj b/src/ModularMonolith/ClassifiedAds.Background/ClassifiedAds.Background.csproj
similarity index 91%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
rename to src/ModularMonolith/ClassifiedAds.Background/ClassifiedAds.Background.csproj
index 4cfdbf1c6..4e6db2e11 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
+++ b/src/ModularMonolith/ClassifiedAds.Background/ClassifiedAds.Background.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <AssemblyName>ClassifiedAds.BackgroundServer</AssemblyName>
-    <RootNamespace>ClassifiedAds.BackgroundServer</RootNamespace>
+    <AssemblyName>ClassifiedAds.Background</AssemblyName>
+    <RootNamespace>ClassifiedAds.Background</RootNamespace>
     <UserSecretsId>b924d88d-1033-40eb-80bd-48272839dd65</UserSecretsId>
   </PropertyGroup>
 
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs b/src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
similarity index 91%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs
rename to src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
index 8c463d514..c6db6d89c 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs
+++ b/src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
@@ -2,7 +2,7 @@
 using ClassifiedAds.Infrastructure.MessageBrokers;
 using Microsoft.Extensions.Options;
 
-namespace ClassifiedAds.BackgroundServer.ConfigurationOptions;
+namespace ClassifiedAds.Background.ConfigurationOptions;
 
 public class AppSettings
 {
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ModulesOptions.cs b/src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/ModulesOptions.cs
similarity index 81%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ModulesOptions.cs
rename to src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/ModulesOptions.cs
index 62bb9a745..67c0c7746 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ModulesOptions.cs
+++ b/src/ModularMonolith/ClassifiedAds.Background/ConfigurationOptions/ModulesOptions.cs
@@ -1,7 +1,7 @@
 using ClassifiedAds.Modules.Notification.ConfigurationOptions;
 using ClassifiedAds.Modules.Storage.ConfigurationOptions;
 
-namespace ClassifiedAds.BackgroundServer.ConfigurationOptions;
+namespace ClassifiedAds.Background.ConfigurationOptions;
 
 public class ModulesOptions
 {
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile b/src/ModularMonolith/ClassifiedAds.Background/Dockerfile
similarity index 80%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile
rename to src/ModularMonolith/ClassifiedAds.Background/Dockerfile
index dfcc52f3b..4f3d0389e 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Dockerfile
+++ b/src/ModularMonolith/ClassifiedAds.Background/Dockerfile
@@ -18,17 +18,17 @@ COPY ./ClassifiedAds.Modules.Notification/*.csproj ./ClassifiedAds.Modules.Notif
 COPY ./ClassifiedAds.Modules.Product/*.csproj ./ClassifiedAds.Modules.Product/
 COPY ./ClassifiedAds.Modules.Storage/*.csproj ./ClassifiedAds.Modules.Storage/
 
-COPY ./ClassifiedAds.BackgroundServer/*.csproj ./ClassifiedAds.BackgroundServer/
+COPY ./ClassifiedAds.Background/*.csproj ./ClassifiedAds.Background/
 
-RUN dotnet restore ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
+RUN dotnet restore ./ClassifiedAds.Background/ClassifiedAds.Background.csproj
 
 # Copy everything else and build
 COPY . ./
-RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -c Release -o out
+RUN dotnet publish ./ClassifiedAds.Background/ClassifiedAds.Background.csproj -c Release -o out
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /ClassifiedAds.ModularMonolith
 COPY --from=build-env /ClassifiedAds.ModularMonolith/out .
 
-ENTRYPOINT ["dotnet", "ClassifiedAds.BackgroundServer.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "ClassifiedAds.Background.dll"]
\ No newline at end of file
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs b/src/ModularMonolith/ClassifiedAds.Background/Identity/CurrentUser.cs
similarity index 79%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs
rename to src/ModularMonolith/ClassifiedAds.Background/Identity/CurrentUser.cs
index df71bca21..c57fcda7f 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs
+++ b/src/ModularMonolith/ClassifiedAds.Background/Identity/CurrentUser.cs
@@ -1,7 +1,7 @@
 using ClassifiedAds.Contracts.Identity.Services;
 using System;
 
-namespace ClassifiedAds.BackgroundServer.Identity;
+namespace ClassifiedAds.Background.Identity;
 
 public class CurrentUser : ICurrentUser
 {
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Program.cs b/src/ModularMonolith/ClassifiedAds.Background/Program.cs
similarity index 93%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/Program.cs
rename to src/ModularMonolith/ClassifiedAds.Background/Program.cs
index 302f768b9..8a7745ce2 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Program.cs
+++ b/src/ModularMonolith/ClassifiedAds.Background/Program.cs
@@ -1,5 +1,5 @@
-using ClassifiedAds.BackgroundServer.ConfigurationOptions;
-using ClassifiedAds.BackgroundServer.Identity;
+using ClassifiedAds.Background.ConfigurationOptions;
+using ClassifiedAds.Background.Identity;
 using ClassifiedAds.Contracts.Identity.Services;
 using ClassifiedAds.Domain.Infrastructure.MessageBrokers;
 using ClassifiedAds.Infrastructure.Logging;
@@ -48,6 +48,9 @@
     .AddStorageModule(opt => configuration.GetSection("Modules:Storage").Bind(opt))
     .AddApplicationServices();
 
+    services.AddHtmlRazorLightEngine();
+    services.AddDinkToPdfConverter();
+
     services.AddDataProtection()
     .PersistKeysToDbContext<IdentityDbContext>()
     .SetApplicationName("ClassifiedAds");
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json b/src/ModularMonolith/ClassifiedAds.Background/Properties/launchSettings.json
similarity index 81%
rename from src/Monolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json
rename to src/ModularMonolith/ClassifiedAds.Background/Properties/launchSettings.json
index 929d5eba1..bd285464e 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json
+++ b/src/ModularMonolith/ClassifiedAds.Background/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "ClassifiedAds.BackgroundServer": {
+    "ClassifiedAds.Background": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "environmentVariables": {
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.Development.json b/src/ModularMonolith/ClassifiedAds.Background/appsettings.Development.json
similarity index 100%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.Development.json
rename to src/ModularMonolith/ClassifiedAds.Background/appsettings.Development.json
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json b/src/ModularMonolith/ClassifiedAds.Background/appsettings.json
similarity index 100%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/appsettings.json
rename to src/ModularMonolith/ClassifiedAds.Background/appsettings.json
diff --git a/src/ModularMonolith/ClassifiedAds.Migrator/Program.cs b/src/ModularMonolith/ClassifiedAds.Migrator/Program.cs
index f5c94f388..e9eb4a908 100644
--- a/src/ModularMonolith/ClassifiedAds.Migrator/Program.cs
+++ b/src/ModularMonolith/ClassifiedAds.Migrator/Program.cs
@@ -63,6 +63,9 @@
 })
 .AddApplicationServices();
 
+services.AddHtmlRazorLightEngine();
+services.AddDinkToPdfConverter();
+
 services.AddDataProtection()
     .PersistKeysToDbContext<IdentityDbContext>()
     .SetApplicationName("ClassifiedAds");
diff --git a/src/ModularMonolith/ClassifiedAds.ModularMonolith.sln b/src/ModularMonolith/ClassifiedAds.ModularMonolith.sln
index 76f2f4292..99d9777c9 100644
--- a/src/ModularMonolith/ClassifiedAds.ModularMonolith.sln
+++ b/src/ModularMonolith/ClassifiedAds.ModularMonolith.sln
@@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Modules.Produ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Modules.Product.EndToEndTests", "ClassifiedAds.Modules.Product.EndToEndTests\ClassifiedAds.Modules.Product.EndToEndTests.csproj", "{4795E8FC-5D27-48AB-A148-3E44B13D4AE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.BackgroundServer", "ClassifiedAds.BackgroundServer\ClassifiedAds.BackgroundServer.csproj", "{4CE975AB-01F3-4D67-94D8-CA049D691E27}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Background", "ClassifiedAds.Background\ClassifiedAds.Background.csproj", "{4CE975AB-01F3-4D67-94D8-CA049D691E27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Modules.Configuration", "ClassifiedAds.Modules.Configuration\ClassifiedAds.Modules.Configuration.csproj", "{B556F32D-D996-4296-9075-E7E2E2F4B8C3}"
 EndProject
diff --git a/src/ModularMonolith/Jenkinsfile b/src/ModularMonolith/Jenkinsfile
index 918d87c3a..f384b51c6 100644
--- a/src/ModularMonolith/Jenkinsfile
+++ b/src/ModularMonolith/Jenkinsfile
@@ -23,7 +23,7 @@ pipeline {
     stage('Publish') {
       steps {
         dir('src/ModularMonolith') {
-          sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.BackgroundServer/*.csproj --configuration Release"
+          sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.Background/*.csproj --configuration Release"
           sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.Migrator/*.csproj --configuration Release"
           sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.WebAPI/*.csproj --configuration Release"
         }
diff --git a/src/ModularMonolith/README.md b/src/ModularMonolith/README.md
index b3c11bde0..6822f5f98 100644
--- a/src/ModularMonolith/README.md
+++ b/src/ModularMonolith/README.md
@@ -8,7 +8,7 @@
   | Project  | Configuration File | Configuration Key |
   | -------- | ------------------ | ----------------- |
   | ClassifiedAds.Migrator | [appsettings.json](ClassifiedAds.Migrator/appsettings.json) | ConnectionStrings:ClassifiedAds |
-  | ClassifiedAds.BackgroundServer | [appsettings.json](ClassifiedAds.BackgroundServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
+  | ClassifiedAds.Background | [appsettings.json](ClassifiedAds.Background/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.IdentityServer | [appsettings.json](../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.WebAPI | [appsettings.json](ClassifiedAds.WebAPI/appsettings.json) | ConnectionStrings:ClassifiedAds |
 
@@ -74,7 +74,7 @@
 
 - Tag
   ```
-  docker tag classifiedads.modularmonolith.backgroundserver phongnguyend/classifiedads.modularmonolith.backgroundserver
+  docker tag classifiedads.modularmonolith.background phongnguyend/classifiedads.modularmonolith.background
   docker tag classifiedads.modularmonolith.migrator phongnguyend/classifiedads.modularmonolith.migrator
   docker tag classifiedads.modularmonolith.webapi phongnguyend/classifiedads.modularmonolith.webapi
   docker tag classifiedads.modularmonolith.identityserver phongnguyend/classifiedads.modularmonolith.identityserver
@@ -82,7 +82,7 @@
 
 - Push
   ```
-  docker push phongnguyend/classifiedads.modularmonolith.backgroundserver
+  docker push phongnguyend/classifiedads.modularmonolith.background
   docker push phongnguyend/classifiedads.modularmonolith.migrator
   docker push phongnguyend/classifiedads.modularmonolith.webapi
   docker push phongnguyend/classifiedads.modularmonolith.identityserver
@@ -131,7 +131,7 @@
   dotnet build -p:Version=1.0.0.1 -c Release
 
   dotnet publish -p:Version=1.0.0.1 -c Release ../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -o ./publish/ClassifiedAds.IdentityServer
-  dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -o ./publish/ClassifiedAds.BackgroundServer
+  dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Background/ClassifiedAds.Background.csproj -o ./publish/ClassifiedAds.Background
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj -o ./publish/ClassifiedAds.Migrator
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj -o ./publish/ClassifiedAds.WebAPI
   ```
@@ -139,7 +139,7 @@
 - Pack
   ```
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.IdentityServer --basePath=./publish/ClassifiedAds.IdentityServer
-  dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.BackgroundServer --basePath=./publish/ClassifiedAds.BackgroundServer
+  dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.Background --basePath=./publish/ClassifiedAds.Background
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.Migrator --basePath=./publish/ClassifiedAds.Migrator
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.WebAPI --basePath=./publish/ClassifiedAds.WebAPI
   ```
diff --git a/src/ModularMonolith/azure-pipelines.yml b/src/ModularMonolith/azure-pipelines.yml
index ad201c6c2..bd3b26651 100644
--- a/src/ModularMonolith/azure-pipelines.yml
+++ b/src/ModularMonolith/azure-pipelines.yml
@@ -83,7 +83,7 @@ stages:
           command: 'publish'
           publishWebProjects: false
           projects: |
-            src/ModularMonolith/ClassifiedAds.BackgroundServer/*.csproj
+            src/ModularMonolith/ClassifiedAds.Background/*.csproj
             src/ModularMonolith/ClassifiedAds.Migrator/*.csproj
             src/ModularMonolith/ClassifiedAds.NotificationServer/*.csproj
             src/ModularMonolith/ClassifiedAds.WebAPI/*.csproj
diff --git a/src/ModularMonolith/docker build.txt b/src/ModularMonolith/docker build.txt
index 5041096f3..d84c52b21 100644
--- a/src/ModularMonolith/docker build.txt	
+++ b/src/ModularMonolith/docker build.txt	
@@ -1,15 +1,15 @@
 
-docker build -f "ClassifiedAds.BackgroundServer\Dockerfile" -t classifiedads.modularmonolith.backgroundserver .
+docker build -f "ClassifiedAds.Background\Dockerfile" -t classifiedads.modularmonolith.background .
 docker build -f "ClassifiedAds.Migrator\Dockerfile" -t classifiedads.modularmonolith.migrator .
 docker build -f "ClassifiedAds.WebAPI\Dockerfile" -t classifiedads.modularmonolith.webapi .
 docker build -f "ClassifiedAds.IdentityServer\Dockerfile" -t classifiedads.modularmonolith.identityserver .
 
-docker tag classifiedads.modularmonolith.backgroundserver phongnguyend/classifiedads.modularmonolith.backgroundserver
+docker tag classifiedads.modularmonolith.background phongnguyend/classifiedads.modularmonolith.background
 docker tag classifiedads.modularmonolith.migrator phongnguyend/classifiedads.modularmonolith.migrator
 docker tag classifiedads.modularmonolith.webapi phongnguyend/classifiedads.modularmonolith.webapi
 docker tag classifiedads.modularmonolith.identityserver phongnguyend/classifiedads.modularmonolith.identityserver
 
-docker push phongnguyend/classifiedads.modularmonolith.backgroundserver
+docker push phongnguyend/classifiedads.modularmonolith.background
 docker push phongnguyend/classifiedads.modularmonolith.migrator
 docker push phongnguyend/classifiedads.modularmonolith.webapi
 docker push phongnguyend/classifiedads.modularmonolith.identityserver
diff --git a/src/ModularMonolith/docker-compose.volumes.yml b/src/ModularMonolith/docker-compose.volumes.yml
index c05ffba66..233e35f20 100644
--- a/src/ModularMonolith/docker-compose.volumes.yml
+++ b/src/ModularMonolith/docker-compose.volumes.yml
@@ -10,6 +10,6 @@ services:
         volumes:
             - D:\\ClassifiedAds.ModularMonolith\\Logs\\WebAPI:/ClassifiedAds.ModularMonolith/logs
             - D:\\ClassifiedAds.ModularMonolith\\Files:/files
-    backgroundserver:
+    background:
         volumes:
-            - D:\\ClassifiedAds.ModularMonolith\\Logs\\BackgroundServer:/ClassifiedAds.ModularMonolith/logs
+            - D:\\ClassifiedAds.ModularMonolith\\Logs\\Background:/ClassifiedAds.ModularMonolith/logs
diff --git a/src/ModularMonolith/docker-compose.yml b/src/ModularMonolith/docker-compose.yml
index 4854d37a6..bbd7242cf 100644
--- a/src/ModularMonolith/docker-compose.yml
+++ b/src/ModularMonolith/docker-compose.yml
@@ -76,11 +76,11 @@ services:
           Modules__Storage__ConnectionStrings__Default: ${Modules__Storage__ConnectionStrings__Default}
           Modules__Storage__Provider: ${Storage__Provider}
           Modules__Storage__Local__Path: ${Storage__Local__Path}
-    backgroundserver:
-        image: classifiedads.modularmonolith.backgroundserver
+    background:
+        image: classifiedads.modularmonolith.background
         build:
           context: .
-          dockerfile: ./ClassifiedAds.BackgroundServer/Dockerfile
+          dockerfile: ./ClassifiedAds.Background/Dockerfile
         depends_on:
           - db
           - migrator
diff --git a/src/Monolith/.helm/monolith/charts/backgroundserver/Chart.yaml b/src/Monolith/.helm/monolith/charts/background/Chart.yaml
similarity index 67%
rename from src/Monolith/.helm/monolith/charts/backgroundserver/Chart.yaml
rename to src/Monolith/.helm/monolith/charts/background/Chart.yaml
index d75a63f6f..db153c277 100644
--- a/src/Monolith/.helm/monolith/charts/backgroundserver/Chart.yaml
+++ b/src/Monolith/.helm/monolith/charts/background/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
-name: backgroundserver
+name: background
 version: 1.0.0
 type: application
\ No newline at end of file
diff --git a/src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml b/src/Monolith/.helm/monolith/charts/background/templates/background.deployment.yaml
similarity index 66%
rename from src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml
rename to src/Monolith/.helm/monolith/charts/background/templates/background.deployment.yaml
index 66a2f948a..655d9499b 100644
--- a/src/Monolith/.helm/monolith/charts/backgroundserver/templates/backgroundserver.deployment.yaml
+++ b/src/Monolith/.helm/monolith/charts/background/templates/background.deployment.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: {{ .Release.Name}}-backgroundserver
-  name: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
+  name: {{ .Release.Name}}-background
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: {{ .Release.Name}}-backgroundserver
+      app: {{ .Release.Name}}-background
   strategy: {}
   template:
     metadata:
       labels:
-        app: {{ .Release.Name}}-backgroundserver
+        app: {{ .Release.Name}}-background
     spec:
       containers:
       - env:
@@ -24,8 +24,8 @@ spec:
         envFrom:
         - configMapRef:
             name: {{ .Release.Name}}-shared
-        image: phongnguyend/classifiedads.backgroundserver
-        name: {{ .Release.Name}}-backgroundserver
+        image: phongnguyend/classifiedads.background
+        name: {{ .Release.Name}}-background
         ports:
         - containerPort: 80
         resources: {}
diff --git a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.service.yaml b/src/Monolith/.helm/monolith/charts/background/templates/background.service.yaml
similarity index 52%
rename from src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.service.yaml
rename to src/Monolith/.helm/monolith/charts/background/templates/background.service.yaml
index 220c387bc..c8c5aeb22 100644
--- a/src/ModularMonolith/.helm/modularmonolith/charts/backgroundserver/templates/backgroundserver.service.yaml
+++ b/src/Monolith/.helm/monolith/charts/background/templates/background.service.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: {{ .Release.Name}}-backgroundserver
-  name: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
+  name: {{ .Release.Name}}-background
 spec:
   ports:
   - name: "80"
     port: 80
     targetPort: 80
   selector:
-    app: {{ .Release.Name}}-backgroundserver
+    app: {{ .Release.Name}}-background
 status:
   loadBalancer: {}
diff --git a/src/Monolith/.helm/monolith/charts/backgroundserver/values.yaml b/src/Monolith/.helm/monolith/charts/background/values.yaml
similarity index 100%
rename from src/Monolith/.helm/monolith/charts/backgroundserver/values.yaml
rename to src/Monolith/.helm/monolith/charts/background/values.yaml
diff --git a/src/Monolith/.helm/monolith/charts/webmvc/templates/webmvc.deployment.yaml b/src/Monolith/.helm/monolith/charts/webmvc/templates/webmvc.deployment.yaml
index f24592ca7..3cb0b78be 100644
--- a/src/Monolith/.helm/monolith/charts/webmvc/templates/webmvc.deployment.yaml
+++ b/src/Monolith/.helm/monolith/charts/webmvc/templates/webmvc.deployment.yaml
@@ -17,8 +17,6 @@ spec:
     spec:
       containers:
       - env:
-        - name: BackgroundServer__Endpoint
-          value: http://{{ .Release.Name}}-backgroundserver
         - name: CheckDependency__Enabled
           value: "true"
         - name: CheckDependency__Host
diff --git a/src/Monolith/.k8s/backgroundserver.deployment.yaml b/src/Monolith/.k8s/background.deployment.yaml
similarity index 72%
rename from src/Monolith/.k8s/backgroundserver.deployment.yaml
rename to src/Monolith/.k8s/background.deployment.yaml
index 0fca9f62c..6622582ab 100644
--- a/src/Monolith/.k8s/backgroundserver.deployment.yaml
+++ b/src/Monolith/.k8s/background.deployment.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: backgroundserver
-  name: backgroundserver
+    app: background
+  name: background
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: backgroundserver
+      app: background
   strategy: {}
   template:
     metadata:
       labels:
-        app: backgroundserver
+        app: background
     spec:
       containers:
       - env:
@@ -24,8 +24,8 @@ spec:
         envFrom:
         - configMapRef:
             name: shared
-        image: phongnguyend/classifiedads.backgroundserver
-        name: backgroundserver
+        image: phongnguyend/classifiedads.background
+        name: background
         ports:
         - containerPort: 80
         resources: {}
diff --git a/src/Monolith/.k8s/backgroundserver.service.yaml b/src/Monolith/.k8s/background.service.yaml
similarity index 66%
rename from src/Monolith/.k8s/backgroundserver.service.yaml
rename to src/Monolith/.k8s/background.service.yaml
index f394626c9..b8529ca50 100644
--- a/src/Monolith/.k8s/backgroundserver.service.yaml
+++ b/src/Monolith/.k8s/background.service.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: backgroundserver
-  name: backgroundserver
+    app: background
+  name: background
 spec:
   ports:
   - name: "80"
     port: 80
     targetPort: 80
   selector:
-    app: backgroundserver
+    app: background
 status:
   loadBalancer: {}
diff --git a/src/Monolith/.k8s/webmvc.deployment.yaml b/src/Monolith/.k8s/webmvc.deployment.yaml
index f058ce47f..fbe15a77b 100644
--- a/src/Monolith/.k8s/webmvc.deployment.yaml
+++ b/src/Monolith/.k8s/webmvc.deployment.yaml
@@ -17,8 +17,6 @@ spec:
     spec:
       containers:
       - env:
-        - name: BackgroundServer__Endpoint
-          value: http://backgroundserver
         - name: CheckDependency__Enabled
           value: "true"
         - name: CheckDependency__Host
diff --git a/src/Monolith/.vscode/launch.json b/src/Monolith/.vscode/launch.json
index dba426ad2..5d58dd912 100644
--- a/src/Monolith/.vscode/launch.json
+++ b/src/Monolith/.vscode/launch.json
@@ -5,13 +5,13 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "ClassifiedAds.BackgroundServer",
+            "name": "ClassifiedAds.Background",
             "type": "coreclr",
             "request": "launch",
             //"preLaunchTask": "build",
-            "program": "${workspaceFolder}/ClassifiedAds.BackgroundServer/bin/Debug/net6.0/ClassifiedAds.BackgroundServer.dll",
+            "program": "${workspaceFolder}/ClassifiedAds.Background/bin/Debug/net6.0/ClassifiedAds.Background.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/ClassifiedAds.BackgroundServer",
+            "cwd": "${workspaceFolder}/ClassifiedAds.Background",
             "stopAtEntry": false,
             "console": "internalConsole",
             "env": {
@@ -174,7 +174,7 @@
     "compounds": [
         {
             "name": "ClassifiedAds.Monolith",
-            "configurations": ["ClassifiedAds.BackgroundServer", "ClassifiedAds.GraphQL", "ClassifiedAds.Migrator", "ClassifiedAds.WebAPI","ClassifiedAds.BlazorServerSide","ClassifiedAds.BlazorWebAssembly","ClassifiedAds.IdentityServer","ClassifiedAds.WebMVC"]
+            "configurations": ["ClassifiedAds.Background", "ClassifiedAds.GraphQL", "ClassifiedAds.Migrator", "ClassifiedAds.WebAPI","ClassifiedAds.BlazorServerSide","ClassifiedAds.BlazorWebAssembly","ClassifiedAds.IdentityServer","ClassifiedAds.WebMVC"]
         }
     ]
 }
\ No newline at end of file
diff --git a/src/Monolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj b/src/Monolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
index 42999a54a..242dfd847 100644
--- a/src/Monolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
+++ b/src/Monolith/ClassifiedAds.AspireAppHost/ClassifiedAds.AspireAppHost.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ClassifiedAds.BackgroundServer\ClassifiedAds.BackgroundServer.csproj" />
+    <ProjectReference Include="..\ClassifiedAds.Background\ClassifiedAds.Background.csproj" />
     <ProjectReference Include="..\ClassifiedAds.BlazorServerSide\ClassifiedAds.BlazorServerSide.csproj" />
     <ProjectReference Include="..\ClassifiedAds.BlazorWebAssembly\ClassifiedAds.BlazorWebAssembly.csproj" />
     <ProjectReference Include="..\ClassifiedAds.GraphQL\ClassifiedAds.GraphQL.csproj" />
diff --git a/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs b/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
index a34f9befb..1e8423f93 100644
--- a/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
+++ b/src/Monolith/ClassifiedAds.AspireAppHost/Program.cs
@@ -1,7 +1,7 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var migrator = builder.AddProject<Projects.ClassifiedAds_Migrator>("ClassifiedAds-Migrator");
-var background = builder.AddProject<Projects.ClassifiedAds_BackgroundServer>("ClassifiedAds-BackgroundServer");
+var background = builder.AddProject<Projects.ClassifiedAds_Background>("ClassifiedAds-Background");
 var graphQL = builder.AddProject<Projects.ClassifiedAds_GraphQL>("ClassifiedAds-GraphQL");
 var webApi = builder.AddProject<Projects.ClassifiedAds_WebAPI>("ClassifiedAds-WebAPI");
 var webMvc = builder.AddProject<Projects.ClassifiedAds_WebMVC>("ClassifiedAds-WebMVC");
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj b/src/Monolith/ClassifiedAds.Background/ClassifiedAds.Background.csproj
similarity index 100%
rename from src/Monolith/ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
rename to src/Monolith/ClassifiedAds.Background/ClassifiedAds.Background.csproj
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs b/src/Monolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
similarity index 95%
rename from src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs
rename to src/Monolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
index 9a9113f1f..e65b9c768 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/AppSettings.cs
+++ b/src/Monolith/ClassifiedAds.Background/ConfigurationOptions/AppSettings.cs
@@ -6,7 +6,7 @@
 using ClassifiedAds.Infrastructure.Storages;
 using Microsoft.Extensions.Options;
 
-namespace ClassifiedAds.BackgroundServer.ConfigurationOptions;
+namespace ClassifiedAds.Background.ConfigurationOptions;
 
 public class AppSettings
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ConnectionStrings.cs b/src/Monolith/ClassifiedAds.Background/ConfigurationOptions/ConnectionStrings.cs
similarity index 55%
rename from src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ConnectionStrings.cs
rename to src/Monolith/ClassifiedAds.Background/ConfigurationOptions/ConnectionStrings.cs
index 88096b8d1..7bb139b44 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/ConfigurationOptions/ConnectionStrings.cs
+++ b/src/Monolith/ClassifiedAds.Background/ConfigurationOptions/ConnectionStrings.cs
@@ -1,4 +1,4 @@
-namespace ClassifiedAds.BackgroundServer.ConfigurationOptions;
+namespace ClassifiedAds.Background.ConfigurationOptions;
 
 public class ConnectionStrings
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile b/src/Monolith/ClassifiedAds.Background/Dockerfile
similarity index 71%
rename from src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile
rename to src/Monolith/ClassifiedAds.Background/Dockerfile
index ecd37fdb0..a8fb4ed6e 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/Dockerfile
+++ b/src/Monolith/ClassifiedAds.Background/Dockerfile
@@ -11,16 +11,16 @@ COPY ./ClassifiedAds.Persistence/*.csproj ./ClassifiedAds.Persistence/
 RUN dotnet restore ./ClassifiedAds.Application/ClassifiedAds.Application.csproj
 RUN dotnet restore ./ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj
 
-COPY ./ClassifiedAds.BackgroundServer/*.csproj ./ClassifiedAds.BackgroundServer/
-RUN dotnet restore ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj
+COPY ./ClassifiedAds.Background/*.csproj ./ClassifiedAds.Background/
+RUN dotnet restore ./ClassifiedAds.Background/ClassifiedAds.Background.csproj
 
 # Copy everything else and build
 COPY . ./
-RUN dotnet publish ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -c Release -o out
+RUN dotnet publish ./ClassifiedAds.Background/ClassifiedAds.Background.csproj -c Release -o out
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /ClassifiedAds.Monolith
 COPY --from=build-env /ClassifiedAds.Monolith/out .
 
-ENTRYPOINT ["dotnet", "ClassifiedAds.BackgroundServer.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "ClassifiedAds.Background.dll"]
\ No newline at end of file
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/PublishEventWorker.cs b/src/Monolith/ClassifiedAds.Background/HostedServices/PublishEventWorker.cs
similarity index 97%
rename from src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/PublishEventWorker.cs
rename to src/Monolith/ClassifiedAds.Background/HostedServices/PublishEventWorker.cs
index 086362f17..ae33c6845 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/PublishEventWorker.cs
+++ b/src/Monolith/ClassifiedAds.Background/HostedServices/PublishEventWorker.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.HostedServices;
+namespace ClassifiedAds.Background.HostedServices;
 
 public class PublishEventWorker : BackgroundService
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/ScheduleCronJobWorker.cs b/src/Monolith/ClassifiedAds.Background/HostedServices/ScheduleCronJobWorker.cs
similarity index 96%
rename from src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/ScheduleCronJobWorker.cs
rename to src/Monolith/ClassifiedAds.Background/HostedServices/ScheduleCronJobWorker.cs
index c0842dd17..4fb15de7f 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/ScheduleCronJobWorker.cs
+++ b/src/Monolith/ClassifiedAds.Background/HostedServices/ScheduleCronJobWorker.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.HostedServices;
+namespace ClassifiedAds.Background.HostedServices;
 
 public class ScheduleCronJobWorker : CronJobBackgroundService
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendEmailWorker.cs b/src/Monolith/ClassifiedAds.Background/HostedServices/SendEmailWorker.cs
similarity index 96%
rename from src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendEmailWorker.cs
rename to src/Monolith/ClassifiedAds.Background/HostedServices/SendEmailWorker.cs
index f47a63d7f..a5c0d394e 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendEmailWorker.cs
+++ b/src/Monolith/ClassifiedAds.Background/HostedServices/SendEmailWorker.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.HostedServices;
+namespace ClassifiedAds.Background.HostedServices;
 
 public class SendEmailWorker : BackgroundService
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendSmsWorker.cs b/src/Monolith/ClassifiedAds.Background/HostedServices/SendSmsWorker.cs
similarity index 96%
rename from src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendSmsWorker.cs
rename to src/Monolith/ClassifiedAds.Background/HostedServices/SendSmsWorker.cs
index 952e405d1..3698dab9b 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SendSmsWorker.cs
+++ b/src/Monolith/ClassifiedAds.Background/HostedServices/SendSmsWorker.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.HostedServices;
+namespace ClassifiedAds.Background.HostedServices;
 
 public class SendSmsWorker : BackgroundService
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SyncUsersWorker.cs b/src/Monolith/ClassifiedAds.Background/HostedServices/SyncUsersWorker.cs
similarity index 96%
rename from src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SyncUsersWorker.cs
rename to src/Monolith/ClassifiedAds.Background/HostedServices/SyncUsersWorker.cs
index a0d5a17e5..f353b9205 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/HostedServices/SyncUsersWorker.cs
+++ b/src/Monolith/ClassifiedAds.Background/HostedServices/SyncUsersWorker.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.HostedServices;
+namespace ClassifiedAds.Background.HostedServices;
 
 public class SyncUsersWorker : BackgroundService
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs b/src/Monolith/ClassifiedAds.Background/Identity/CurrentUser.cs
similarity index 78%
rename from src/Monolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs
rename to src/Monolith/ClassifiedAds.Background/Identity/CurrentUser.cs
index 48a613183..d94695dfa 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/Identity/CurrentUser.cs
+++ b/src/Monolith/ClassifiedAds.Background/Identity/CurrentUser.cs
@@ -1,7 +1,7 @@
 using ClassifiedAds.Domain.Identity;
 using System;
 
-namespace ClassifiedAds.BackgroundServer.Identity;
+namespace ClassifiedAds.Background.Identity;
 
 public class CurrentUser : ICurrentUser
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/MessageBusConsumers/WebhookConsumer.cs b/src/Monolith/ClassifiedAds.Background/MessageBusConsumers/WebhookConsumer.cs
similarity index 95%
rename from src/Monolith/ClassifiedAds.BackgroundServer/MessageBusConsumers/WebhookConsumer.cs
rename to src/Monolith/ClassifiedAds.Background/MessageBusConsumers/WebhookConsumer.cs
index 0334fa45f..e189b80b8 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/MessageBusConsumers/WebhookConsumer.cs
+++ b/src/Monolith/ClassifiedAds.Background/MessageBusConsumers/WebhookConsumer.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.MessageBusConsumers;
+namespace ClassifiedAds.Background.MessageBusConsumers;
 
 public sealed class WebhookConsumer :
     IMessageBusConsumer<WebhookConsumer, FileUploadedEvent>,
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs b/src/Monolith/ClassifiedAds.Background/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs
similarity index 95%
rename from src/Monolith/ClassifiedAds.BackgroundServer/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs
rename to src/Monolith/ClassifiedAds.Background/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs
index d0abde48d..76edba34e 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs
+++ b/src/Monolith/ClassifiedAds.Background/OutBoxEventPublishers/FileEntryOutBoxEventPublisher.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ClassifiedAds.BackgroundServer.OutBoxEventPublishers;
+namespace ClassifiedAds.Background.OutBoxEventPublishers;
 
 public class FileEntryOutBoxEventPublisher : IOutBoxEventPublisher
 {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/Program.cs b/src/Monolith/ClassifiedAds.Background/Program.cs
similarity index 93%
rename from src/Monolith/ClassifiedAds.BackgroundServer/Program.cs
rename to src/Monolith/ClassifiedAds.Background/Program.cs
index 61b56d330..7f455944e 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/Program.cs
+++ b/src/Monolith/ClassifiedAds.Background/Program.cs
@@ -1,8 +1,8 @@
 using ClassifiedAds.Application.FileEntries.DTOs;
-using ClassifiedAds.BackgroundServer.ConfigurationOptions;
-using ClassifiedAds.BackgroundServer.HostedServices;
-using ClassifiedAds.BackgroundServer.Identity;
-using ClassifiedAds.BackgroundServer.MessageBusConsumers;
+using ClassifiedAds.Background.ConfigurationOptions;
+using ClassifiedAds.Background.HostedServices;
+using ClassifiedAds.Background.Identity;
+using ClassifiedAds.Background.MessageBusConsumers;
 using ClassifiedAds.CrossCuttingConcerns.Exceptions;
 using ClassifiedAds.Domain.Identity;
 using ClassifiedAds.Domain.IdentityProviders;
diff --git a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json b/src/Monolith/ClassifiedAds.Background/Properties/launchSettings.json
similarity index 81%
rename from src/ModularMonolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json
rename to src/Monolith/ClassifiedAds.Background/Properties/launchSettings.json
index 929d5eba1..bd285464e 100644
--- a/src/ModularMonolith/ClassifiedAds.BackgroundServer/Properties/launchSettings.json
+++ b/src/Monolith/ClassifiedAds.Background/Properties/launchSettings.json
@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "ClassifiedAds.BackgroundServer": {
+    "ClassifiedAds.Background": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "environmentVariables": {
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.Development.json b/src/Monolith/ClassifiedAds.Background/appsettings.Development.json
similarity index 84%
rename from src/Monolith/ClassifiedAds.BackgroundServer/appsettings.Development.json
rename to src/Monolith/ClassifiedAds.Background/appsettings.Development.json
index 43cdfeb39..fca7ea73d 100644
--- a/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.Development.json
+++ b/src/Monolith/ClassifiedAds.Background/appsettings.Development.json
@@ -7,7 +7,7 @@
     },
     "OpenTelemetry": {
       "IsEnabled": true,
-      "ServiceName": "ClassifiedAds.BackgroundServer",
+      "ServiceName": "ClassifiedAds.Background",
       "Otlp": {
         "IsEnabled": true,
         "Endpoint": "https://localhost:21052"
diff --git a/src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json b/src/Monolith/ClassifiedAds.Background/appsettings.json
similarity index 100%
rename from src/Monolith/ClassifiedAds.BackgroundServer/appsettings.json
rename to src/Monolith/ClassifiedAds.Background/appsettings.json
diff --git a/src/Monolith/ClassifiedAds.Monolith.sln b/src/Monolith/ClassifiedAds.Monolith.sln
index 27a7a5328..b38f3ff3d 100644
--- a/src/Monolith/ClassifiedAds.Monolith.sln
+++ b/src/Monolith/ClassifiedAds.Monolith.sln
@@ -27,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{60BC7A82
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.GraphQL", "ClassifiedAds.GraphQL\ClassifiedAds.GraphQL.csproj", "{FDBA0506-A4E7-405B-918D-66A195F16C95}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.BackgroundServer", "ClassifiedAds.BackgroundServer\ClassifiedAds.BackgroundServer.csproj", "{72E42908-63F6-4981-9023-6018C66604D8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Background", "ClassifiedAds.Background\ClassifiedAds.Background.csproj", "{72E42908-63F6-4981-9023-6018C66604D8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BackEnds", "BackEnds", "{62A1AB08-A2DB-404F-B073-0F89CA780F45}"
 EndProject
diff --git a/src/Monolith/ClassifiedAds.WebMVC/appsettings.json b/src/Monolith/ClassifiedAds.WebMVC/appsettings.json
index d7d4461ac..a2f9024ff 100644
--- a/src/Monolith/ClassifiedAds.WebMVC/appsettings.json
+++ b/src/Monolith/ClassifiedAds.WebMVC/appsettings.json
@@ -24,9 +24,6 @@
     "Endpoint": "https://localhost:44390",
     "PublicEndpoint": "https://localhost:44390"
   },
-  "BackgroundServer": {
-    "Endpoint": "https://localhost:44318"
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
diff --git a/src/Monolith/Jenkinsfile b/src/Monolith/Jenkinsfile
index a6700fef8..cdedeb5fb 100644
--- a/src/Monolith/Jenkinsfile
+++ b/src/Monolith/Jenkinsfile
@@ -23,7 +23,7 @@ pipeline {
     stage('Publish') {
       steps {
         dir('src/Monolith') {
-          sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.BackgroundServer/*.csproj --configuration Release"
+          sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.Background/*.csproj --configuration Release"
           sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.GraphQL/*.csproj --configuration Release"
           sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.Migrator/*.csproj --configuration Release"
           sh "dotnet publish -p:Version=${VERSION} ClassifiedAds.WebAPI/*.csproj --configuration Release"
diff --git a/src/Monolith/README.md b/src/Monolith/README.md
index 61f3bf808..13ff3b631 100644
--- a/src/Monolith/README.md
+++ b/src/Monolith/README.md
@@ -8,7 +8,7 @@
   | Project  | Configuration File | Configuration Key |
   | -------- | ------------------ | ----------------- |
   | ClassifiedAds.Migrator | [appsettings.json](ClassifiedAds.Migrator/appsettings.json) | ConnectionStrings:ClassifiedAds |
-  | ClassifiedAds.BackgroundServer | [appsettings.json](ClassifiedAds.BackgroundServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
+  | ClassifiedAds.Background | [appsettings.json](ClassifiedAds.Background/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.IdentityServer | [appsettings.json](../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.WebAPI | [appsettings.json](ClassifiedAds.WebAPI/appsettings.json) | ConnectionStrings:ClassifiedAds |
   | ClassifiedAds.WebMVC | [appsettings.json](ClassifiedAds.WebMVC/appsettings.json) | ConnectionStrings:ClassifiedAds |
@@ -53,7 +53,7 @@
 
 - Tag
   ```
-  docker tag classifiedads.backgroundserver phongnguyend/classifiedads.backgroundserver
+  docker tag classifiedads.background phongnguyend/classifiedads.background
   docker tag classifiedads.migrator phongnguyend/classifiedads.migrator
   docker tag classifiedads.webapi phongnguyend/classifiedads.webapi
   docker tag classifiedads.graphql phongnguyend/classifiedads.graphql
@@ -64,7 +64,7 @@
 
 - Push
   ```
-  docker push phongnguyend/classifiedads.backgroundserver
+  docker push phongnguyend/classifiedads.background
   docker push phongnguyend/classifiedads.migrator
   docker push phongnguyend/classifiedads.webapi
   docker push phongnguyend/classifiedads.graphql
@@ -116,7 +116,7 @@
   dotnet build -p:Version=1.0.0.1 -c Release
 
   dotnet publish -p:Version=1.0.0.1 -c Release ../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer/ClassifiedAds.IdentityServer.csproj -o ./publish/ClassifiedAds.IdentityServer
-  dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.BackgroundServer/ClassifiedAds.BackgroundServer.csproj -o ./publish/ClassifiedAds.BackgroundServer
+  dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Background/ClassifiedAds.Background.csproj -o ./publish/ClassifiedAds.Background
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.GraphQL/ClassifiedAds.GraphQL.csproj -o ./publish/ClassifiedAds.GraphQL
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.Migrator/ClassifiedAds.Migrator.csproj -o ./publish/ClassifiedAds.Migrator
   dotnet publish -p:Version=1.0.0.1 -c Release ./ClassifiedAds.WebAPI/ClassifiedAds.WebAPI.csproj -o ./publish/ClassifiedAds.WebAPI
@@ -128,7 +128,7 @@
 - Pack
   ```
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.IdentityServer --basePath=./publish/ClassifiedAds.IdentityServer
-  dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.BackgroundServer --basePath=./publish/ClassifiedAds.BackgroundServer 
+  dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.Background --basePath=./publish/ClassifiedAds.Background 
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.GraphQL --basePath=./publish/ClassifiedAds.GraphQL
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.Migrator --basePath=./publish/ClassifiedAds.Migrator
   dotnet octo pack --version=1.0.0.1 --outFolder=./publish --overwrite --id=ClassifiedAds.WebAPI --basePath=./publish/ClassifiedAds.WebAPI
diff --git a/src/Monolith/azure-pipelines.yml b/src/Monolith/azure-pipelines.yml
index e46488a75..6e0aa53e3 100644
--- a/src/Monolith/azure-pipelines.yml
+++ b/src/Monolith/azure-pipelines.yml
@@ -121,7 +121,7 @@ stages:
           command: 'publish'
           publishWebProjects: false
           projects: |
-            src/Monolith/ClassifiedAds.BackgroundServer/*.csproj
+            src/Monolith/ClassifiedAds.Background/*.csproj
             src/Monolith/ClassifiedAds.GraphQL/*.csproj
             src/Monolith/ClassifiedAds.Migrator/*.csproj
             src/Monolith/ClassifiedAds.WebAPI/*.csproj
@@ -195,7 +195,7 @@ stages:
         command: 'publish'
         publishWebProjects: false
         projects: |
-          src/Monolith/ClassifiedAds.BackgroundServer/*.csproj
+          src/Monolith/ClassifiedAds.Background/*.csproj
           src/Monolith/ClassifiedAds.GraphQL/*.csproj
           src/Monolith/ClassifiedAds.Migrator/*.csproj
           src/Monolith/ClassifiedAds.WebAPI/*.csproj
@@ -210,7 +210,7 @@ stages:
       displayName: dotnet octo pack
       inputs:
         script: |
-          dotnet octo pack --version=1.0.0-$(Build.BuildNumber) --outFolder=$(Build.ArtifactStagingDirectory) --overwrite --id=ClassifiedAds.BackgroundServer --basePath=$(Build.ArtifactStagingDirectory)/ClassifiedAds.BackgroundServer
+          dotnet octo pack --version=1.0.0-$(Build.BuildNumber) --outFolder=$(Build.ArtifactStagingDirectory) --overwrite --id=ClassifiedAds.Background --basePath=$(Build.ArtifactStagingDirectory)/ClassifiedAds.Background
           dotnet octo pack --version=1.0.0-$(Build.BuildNumber) --outFolder=$(Build.ArtifactStagingDirectory) --overwrite --id=ClassifiedAds.GraphQL --basePath=$(Build.ArtifactStagingDirectory)/ClassifiedAds.GraphQL
           dotnet octo pack --version=1.0.0-$(Build.BuildNumber) --outFolder=$(Build.ArtifactStagingDirectory) --overwrite --id=ClassifiedAds.Migrator --basePath=$(Build.ArtifactStagingDirectory)/ClassifiedAds.Migrator
           dotnet octo pack --version=1.0.0-$(Build.BuildNumber) --outFolder=$(Build.ArtifactStagingDirectory) --overwrite --id=ClassifiedAds.WebAPI --basePath=$(Build.ArtifactStagingDirectory)/ClassifiedAds.WebAPI
diff --git a/src/Monolith/docker build.txt b/src/Monolith/docker build.txt
index 56f318dee..b3933beb2 100644
--- a/src/Monolith/docker build.txt	
+++ b/src/Monolith/docker build.txt	
@@ -4,7 +4,7 @@ docker run -d -p 8080:80 --name classifiedads.webmvc classifiedads.webmvc
 docker run -d -p 8081:80 --name classifiedads.webapi classifiedads.webapi
 docker run -d -p 8082:80 --name classifiedads.identityserver classifiedads.identityserver
 
-docker build -f "ClassifiedAds.BackgroundServer\Dockerfile" -t classifiedads.backgroundserver .
+docker build -f "ClassifiedAds.Background\Dockerfile" -t classifiedads.background .
 docker build -f "ClassifiedAds.Migrator\Dockerfile" -t classifiedads.migrator .
 docker build -f "ClassifiedAds.WebAPI\Dockerfile" -t classifiedads.webapi .
 docker build -f "ClassifiedAds.GraphQL\Dockerfile" -t classifiedads.graphql .
@@ -12,7 +12,7 @@ docker build -f "ClassifiedAds.BlazorServerSide\Dockerfile" -t classifiedads.bla
 docker build -f "ClassifiedAds.IdentityServer\Dockerfile" -t classifiedads.identityserver .
 docker build -f "ClassifiedAds.WebMVC\Dockerfile" -t classifiedads.webmvc .
 
-docker tag classifiedads.backgroundserver phongnguyend/classifiedads.backgroundserver
+docker tag classifiedads.background phongnguyend/classifiedads.background
 docker tag classifiedads.migrator phongnguyend/classifiedads.migrator
 docker tag classifiedads.webapi phongnguyend/classifiedads.webapi
 docker tag classifiedads.graphql phongnguyend/classifiedads.graphql
@@ -20,7 +20,7 @@ docker tag classifiedads.blazor phongnguyend/classifiedads.blazor
 docker tag classifiedads.identityserver phongnguyend/classifiedads.identityserver
 docker tag classifiedads.webmvc phongnguyend/classifiedads.webmvc
 
-docker push phongnguyend/classifiedads.backgroundserver
+docker push phongnguyend/classifiedads.background
 docker push phongnguyend/classifiedads.migrator
 docker push phongnguyend/classifiedads.webapi
 docker push phongnguyend/classifiedads.graphql
@@ -60,7 +60,7 @@ docker run -d --name rabbitmq -p 5672:5672 -p 5673:5673 -p 15672:15672 rabbitmq:
   | Project  | File |
   | -------- | ---- |
   | ClassifiedAds.Migrator | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.Migrator/docker-entrypoint.sh) |
-  | ClassifiedAds.BackgroundServer | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.BackgroundServer/docker-entrypoint.sh) |
+  | ClassifiedAds.Background | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.Background/docker-entrypoint.sh) |
   | ClassifiedAds.WebMVC | [docker-entrypoint.sh](/src/ClassifiedAds.Projects/ClassifiedAds.WebMVC/docker-entrypoint.sh) |
   
   Otherwise you might encounter:
diff --git a/src/Monolith/docker-compose.volumes.yml b/src/Monolith/docker-compose.volumes.yml
index 5b5209f10..79148567e 100644
--- a/src/Monolith/docker-compose.volumes.yml
+++ b/src/Monolith/docker-compose.volumes.yml
@@ -17,9 +17,9 @@ services:
     blazor:
         volumes:
             - D:\\ClassifiedAds.Monolith\\Logs\\BlazorServerSide:/ClassifiedAds.Monolith/logs
-    backgroundserver:
+    background:
         volumes:
-            - D:\\ClassifiedAds.Monolith\\Logs\\BackgroundServer:/ClassifiedAds.Monolith/logs
+            - D:\\ClassifiedAds.Monolith\\Logs\\Background:/ClassifiedAds.Monolith/logs
     graphql:
         volumes:
             - D:\\ClassifiedAds.Monolith\\Logs\\GraphQL:/ClassifiedAds.Monolith/logs
diff --git a/src/Monolith/docker-compose.yml b/src/Monolith/docker-compose.yml
index f4bafac77..5f4fb1de4 100644
--- a/src/Monolith/docker-compose.yml
+++ b/src/Monolith/docker-compose.yml
@@ -152,11 +152,11 @@ services:
           CookiePolicyOptions__IsEnabled: "true"
           CookiePolicyOptions__MinimumSameSitePolicy: "Lax"
           CookiePolicyOptions__Secure: "None" 
-    backgroundserver:
-        image: classifiedads.backgroundserver
+    background:
+        image: classifiedads.background
         build:
           context: .
-          dockerfile: ./ClassifiedAds.BackgroundServer/Dockerfile
+          dockerfile: ./ClassifiedAds.Background/Dockerfile
         depends_on:
           - db
           - migrator