diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index a765d2e..a89e1fb 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -12,7 +12,7 @@ env:
   CV_MATCHER_API_IMAGE: apps/myai-cv-matcher-api
   RAG_API_IMAGE: apps/myai-rag-api
   WEB_IMAGE: apps/myai-web
-  JOB_IMAGE: apps/myai-job
+  CV_CLEANUP_JOB_IMAGE: apps/myai-cv-cleanup-job
   IMAGE_TAG: staging
 
 jobs:
@@ -48,9 +48,9 @@ jobs:
         run: |
           docker build -f web/Dockerfile -t "${REGISTRY_HOST}/${WEB_IMAGE}:${IMAGE_TAG}" .
 
-      - name: Build Job worker image
+      - name: Build CV cleanup job image
         run: |
-          docker build -f Jobs/cv-cleanup-job/Dockerfile -t "${REGISTRY_HOST}/${JOB_IMAGE}:${IMAGE_TAG}" .
+          docker build -f Jobs/cv-cleanup-job/Dockerfile -t "${REGISTRY_HOST}/${CV_CLEANUP_JOB_IMAGE}:${IMAGE_TAG}" .
 
       - name: Push API image
         run: |
@@ -68,6 +68,6 @@ jobs:
         run: |
           docker push "${REGISTRY_HOST}/${WEB_IMAGE}:${IMAGE_TAG}"
 
-      - name: Push Job worker image
+      - name: Push CV cleanup job image
         run: |
-          docker push "${REGISTRY_HOST}/${JOB_IMAGE}:${IMAGE_TAG}"
\ No newline at end of file
+          docker push "${REGISTRY_HOST}/${CV_CLEANUP_JOB_IMAGE}:${IMAGE_TAG}"
\ No newline at end of file
diff --git a/docker-compose/.env.template b/docker-compose/.env.template
index 7a798cd..8bd6a6c 100644
--- a/docker-compose/.env.template
+++ b/docker-compose/.env.template
@@ -69,7 +69,7 @@ Captcha__SecretKey=
 Captcha__PublicKey=
 Captcha__MinimumScore=0.5
 
-# Job worker (scheduled tasks: CV file storage cleanup, etc.)
+# CV cleanup job container (scheduled CV file storage cleanup)
 Jobs__CvStorageCleanupEnabled=true
 Jobs__CvStorageCleanupInterval=01:00:00
 Jobs__CvStorageMaxTotalSizeMegabytes=40
diff --git a/docker-compose/docker-compose.production.yml b/docker-compose/docker-compose.production.yml
index 96f27a0..0b79c3a 100644
--- a/docker-compose/docker-compose.production.yml
+++ b/docker-compose/docker-compose.production.yml
@@ -206,9 +206,9 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
-  job:
-    image: registry.easysoft.ro/apps/myai-job:production
-    container_name: myai-job
+  cv-cleanup-job:
+    image: registry.easysoft.ro/apps/myai-cv-cleanup-job:production
+    container_name: myai-cv-cleanup-job
     depends_on:
       - api
     environment:
@@ -221,6 +221,7 @@ services:
       - Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
       - Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
     volumes:
+      - /opt/myai/logs/cv-cleanup-job:/app/logs
       - /opt/myai/files:/app/Files
     networks:
       - myai-network
diff --git a/docker-compose/docker-compose.staging.yml b/docker-compose/docker-compose.staging.yml
index d261502..2c40dc6 100644
--- a/docker-compose/docker-compose.staging.yml
+++ b/docker-compose/docker-compose.staging.yml
@@ -206,9 +206,9 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
-  job:
-    image: registry.easysoft.ro/apps/myai-job:staging
-    container_name: myai-job
+  cv-cleanup-job:
+    image: registry.easysoft.ro/apps/myai-cv-cleanup-job:staging
+    container_name: myai-cv-cleanup-job
     depends_on:
       - api
     environment:
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 119405e..a2508fb 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -226,11 +226,11 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
-  job:
+  cv-cleanup-job:
     build:
       context: ..
       dockerfile: Jobs/cv-cleanup-job/Dockerfile
-    container_name: myai-job
+    container_name: myai-cv-cleanup-job
     depends_on:
       - api
     env_file:
@@ -245,7 +245,7 @@ services:
       - Logging__LogLevel__Default=${Logging__LogLevel__Default:-Information}
       - Logging__LogLevel__Microsoft=${Logging__LogLevel__Microsoft:-Warning}
     volumes:
-      - ${FileStorage__Path:-../Files}:/app/Files
+      - ../Apis/api/logs:/app/logs
     networks:
       - myai-network
     restart: unless-stopped