diff --git a/config/services.yaml b/config/services.yaml
index 860d147..efc4f62 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -96,3 +96,7 @@ services:
     App\Domain\Scraping\Infrastructure\Handler\SymfonyScrapeChapterHandler:
         tags:
             - { name: messenger.message_handler, bus: command.bus }
+
+    App\Domain\Scraping\Infrastructure\Service\CbzGenerator:
+        arguments:
+            $projectDir: '%kernel.project_dir%'
diff --git a/config/services_test.yaml b/config/services_test.yaml
index d626944..ec680a7 100644
--- a/config/services_test.yaml
+++ b/config/services_test.yaml
@@ -12,4 +12,14 @@ services:
         class: 'App\Tests\Domain\Scraping\Adapter\InMemoryScrapingJobRepository'
         public: true
 
+    App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface:
+        class: 'App\Tests\Domain\Scraping\Adapter\InMemoryImageDownloader'
+        public: true
+
+    App\Domain\Scraping\Domain\Contract\Service\CbzGeneratorInterface:
+        class: 'App\Tests\Domain\Scraping\Adapter\InMemoryCbzGenerator'
+        arguments:
+            $projectDir: '%kernel.project_dir%'
+        public: true
+
 
diff --git a/migrations/Version20250210154832.php b/migrations/Version20250210154832.php
new file mode 100644
index 0000000..23977cd
--- /dev/null
+++ b/migrations/Version20250210154832.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250210154832 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE scraping_jobs ADD cbz_path VARCHAR(255) DEFAULT NULL');
+        $this->addSql('ALTER TABLE scraping_jobs ADD failure_reason VARCHAR(255) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE scraping_jobs DROP cbz_path');
+        $this->addSql('ALTER TABLE scraping_jobs DROP failure_reason');
+    }
+}
diff --git a/src/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandler.php b/src/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandler.php
index 44b30e2..1861b09 100644
--- a/src/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandler.php
+++ b/src/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandler.php
@@ -5,9 +5,11 @@ namespace App\Domain\Scraping\Application\CommandHandler;
 use App\Domain\Scraping\Application\Command\ScrapeChapter;
 use App\Domain\Scraping\Domain\Contract\Repository\ScrapingJobRepositoryInterface;
 use App\Domain\Scraping\Domain\Contract\Service\ScraperInterface;
+use App\Domain\Scraping\Domain\Event\ChapterScraped;
 use App\Domain\Scraping\Domain\Event\ChapterScrapingFailed;
 use App\Domain\Scraping\Domain\Event\ChapterScrapingStarted;
 use App\Domain\Scraping\Domain\Model\ScrapingJob;
+use App\Domain\Scraping\Domain\Model\ScrapingStatus;
 use Ramsey\Uuid\Uuid;
 use Symfony\Component\Messenger\MessageBusInterface;
 
@@ -34,7 +36,15 @@ readonly class ScrapeChapterHandler
 
             $this->eventBus->dispatch(new ChapterScrapingStarted($job->getId()));
 
-            $this->scraper->scrape($job);
+            $job = $this->scraper->scrape($job);
+
+            if($job->status === ScrapingStatus::FAILED) {
+                $this->eventBus->dispatch(new ChapterScrapingFailed($command->mangaId, $command->chapterNumber, $job->failureReason));
+            }elseif ($job->status === ScrapingStatus::COMPLETED) {
+                $this->eventBus->dispatch(new ChapterScraped($job->getId()));
+            }
+
+            $this->scrapingJobRepository->save($job);
         } catch (\Exception $e) {
             $this->eventBus->dispatch(new ChapterScrapingFailed($command->mangaId, $command->chapterNumber, $e->getMessage()));
             throw $e;
diff --git a/src/Domain/Scraping/Domain/Contract/Repository/ChapterRepositoryInterface.php b/src/Domain/Scraping/Domain/Contract/Repository/ChapterRepositoryInterface.php
new file mode 100644
index 0000000..6f4bb12
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Contract/Repository/ChapterRepositoryInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Contract\Repository;
+
+use App\Domain\Scraping\Domain\Model\Chapter;
+
+interface ChapterRepositoryInterface
+{
+    public function getByMangaIdAndChapterNumber(string $mangaId, int $chapterNumber): Chapter;
+}
\ No newline at end of file
diff --git a/src/Domain/Scraping/Domain/Contract/Service/CbzGeneratorInterface.php b/src/Domain/Scraping/Domain/Contract/Service/CbzGeneratorInterface.php
new file mode 100644
index 0000000..f1c258d
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Contract/Service/CbzGeneratorInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Contract\Service;
+
+use App\Domain\Scraping\Domain\Model\ScrapingJob;
+use App\Domain\Scraping\Domain\Model\ValueObject\CbzPath;
+use App\Domain\Scraping\Domain\Model\ValueObject\TempDirectory;
+
+interface CbzGeneratorInterface
+{
+    public function generate(ScrapingJob $job, TempDirectory $tempDirectory): CbzPath;
+}
diff --git a/src/Domain/Scraping/Domain/Contract/Service/ImageDownloader.php b/src/Domain/Scraping/Domain/Contract/Service/ImageDownloaderInterface.php
similarity index 79%
rename from src/Domain/Scraping/Domain/Contract/Service/ImageDownloader.php
rename to src/Domain/Scraping/Domain/Contract/Service/ImageDownloaderInterface.php
index db9b5df..f3a3737 100644
--- a/src/Domain/Scraping/Domain/Contract/Service/ImageDownloader.php
+++ b/src/Domain/Scraping/Domain/Contract/Service/ImageDownloaderInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Domain\Scraping\Domain\Contract\Service;
 
-interface ImageDownloader
+interface ImageDownloaderInterface
 {
     public function download(string $url, string $destination): void;
 }
diff --git a/src/Domain/Scraping/Domain/Contract/Service/ScraperInterface.php b/src/Domain/Scraping/Domain/Contract/Service/ScraperInterface.php
index beacb47..3c615f5 100644
--- a/src/Domain/Scraping/Domain/Contract/Service/ScraperInterface.php
+++ b/src/Domain/Scraping/Domain/Contract/Service/ScraperInterface.php
@@ -6,6 +6,6 @@ use App\Domain\Scraping\Domain\Model\ScrapingJob;
 
 interface ScraperInterface
 {
-    public function scrape(ScrapingJob $job): void;
+    public function scrape(ScrapingJob $job): ScrapingJob;
     public function supports(string $sourceType): bool;
 }
diff --git a/src/Domain/Scraping/Domain/Event/ChapterScraped.php b/src/Domain/Scraping/Domain/Event/ChapterScraped.php
new file mode 100644
index 0000000..9e785a0
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Event/ChapterScraped.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Event;
+
+class ChapterScraped
+{
+
+    /**
+     * @param string $getId
+     */
+    public function __construct(string $getId)
+    {
+    }
+}
diff --git a/src/Domain/Scraping/Domain/Exception/CbzGenerationException.php b/src/Domain/Scraping/Domain/Exception/CbzGenerationException.php
new file mode 100644
index 0000000..1632894
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Exception/CbzGenerationException.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Exception;
+
+class CbzGenerationException extends \RuntimeException
+{
+    public static function unableToCreateDirectory(string $path): self
+    {
+        return new self(sprintf('Impossible de créer le répertoire : %s', $path));
+    }
+
+    public static function unableToCreateCbz(string $path): self
+    {
+        return new self(sprintf('Impossible de créer le fichier CBZ : %s', $path));
+    }
+
+    public static function unableToAddFileToArchive(string $filePath): self
+    {
+        return new self(sprintf('Impossible d\'ajouter le fichier à l\'archive : %s', $filePath));
+    }
+} 
\ No newline at end of file
diff --git a/src/Domain/Scraping/Domain/Exception/ChapterNotFoundException.php b/src/Domain/Scraping/Domain/Exception/ChapterNotFoundException.php
new file mode 100644
index 0000000..8a5f8e7
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Exception/ChapterNotFoundException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Exception;
+
+class ChapterNotFoundException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('Chapter not found');
+    }
+}
\ No newline at end of file
diff --git a/src/Domain/Scraping/Domain/Model/Chapter.php b/src/Domain/Scraping/Domain/Model/Chapter.php
new file mode 100644
index 0000000..7483598
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Model/Chapter.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Model;
+
+class Chapter
+{
+    public function __construct(
+        public readonly string $id,
+        public readonly string $mangaId,
+        public readonly int $chapterNumber,
+        public readonly int $volumeNumber,
+    ) {}
+}
\ No newline at end of file
diff --git a/src/Domain/Scraping/Domain/Model/Manga.php b/src/Domain/Scraping/Domain/Model/Manga.php
index 62ae5ea..9ca048b 100644
--- a/src/Domain/Scraping/Domain/Model/Manga.php
+++ b/src/Domain/Scraping/Domain/Model/Manga.php
@@ -10,6 +10,7 @@ class Manga
         private readonly string $slug,
         private readonly string $description,
         private readonly string $author,
+        private readonly string $publicationYear,
     ) {
     }
 
@@ -37,4 +38,9 @@ class Manga
     {
         return $this->author;
     }
+
+    public function getPublicationYear(): string
+    {
+        return $this->publicationYear;
+    }
 }
diff --git a/src/Domain/Scraping/Domain/Model/ScrapingJob.php b/src/Domain/Scraping/Domain/Model/ScrapingJob.php
index bf71cda..1c41d27 100644
--- a/src/Domain/Scraping/Domain/Model/ScrapingJob.php
+++ b/src/Domain/Scraping/Domain/Model/ScrapingJob.php
@@ -2,16 +2,19 @@
 
 namespace App\Domain\Scraping\Domain\Model;
 
+use App\Domain\Scraping\Domain\Model\ValueObject\CbzPath;
 use App\Domain\Scraping\Domain\Model\ValueObject\ImageUrl;
 use App\Domain\Scraping\Domain\Model\ValueObject\PageNumber;
 
 class ScrapingJob
 {
-    private array $pages = [];
-    private int $totalPages = 0;
-    private ScrapingStatus $status;
-    private \DateTimeImmutable $createdAt;
-    private ?\DateTimeImmutable $completedAt = null;
+    public array $pages = [];
+    public int $totalPages = 0;
+    public ScrapingStatus $status;
+    public ?CbzPath $cbzPath = null;
+    public string $failureReason = '';
+    public \DateTimeImmutable $createdAt;
+    public ?\DateTimeImmutable $completedAt = null;
 
     public function __construct(
         private readonly string $id,
@@ -37,8 +40,9 @@ class ScrapingJob
         $this->completedAt = new \DateTimeImmutable();
     }
 
-    public function fail(): void
+    public function fail(string $exceptionMessage): void
     {
+        $this->failureReason = $exceptionMessage;
         $this->status = ScrapingStatus::FAILED;
         $this->completedAt = new \DateTimeImmutable();
     }
@@ -63,28 +67,8 @@ class ScrapingJob
         return $this->sourceId;
     }
 
-    public function getPages(): array
+    public function setStatus(ScrapingStatus $status): void
     {
-        return $this->pages;
-    }
-
-    public function getTotalPages(): int
-    {
-        return $this->totalPages;
-    }
-
-    public function getStatus(): ScrapingStatus
-    {
-        return $this->status;
-    }
-
-    public function getCreatedAt(): \DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    public function getCompletedAt(): ?\DateTimeImmutable
-    {
-        return $this->completedAt;
+        $this->status = $status;
     }
 }
diff --git a/src/Domain/Scraping/Domain/Model/ValueObject/CbzPath.php b/src/Domain/Scraping/Domain/Model/ValueObject/CbzPath.php
new file mode 100644
index 0000000..1e31cd8
--- /dev/null
+++ b/src/Domain/Scraping/Domain/Model/ValueObject/CbzPath.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Domain\Scraping\Domain\Model\ValueObject;
+
+class CbzPath
+{
+    public function __construct(private readonly string $path)
+    {
+        if (empty($path)) {
+            throw new \InvalidArgumentException('Le chemin du fichier CBZ ne peut pas être vide');
+        }
+    }
+
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+}
\ No newline at end of file
diff --git a/src/Domain/Scraping/Infrastructure/ApiPlatform/State/Provider/ScrapingStatusStateProvider.php b/src/Domain/Scraping/Infrastructure/ApiPlatform/State/Provider/ScrapingStatusStateProvider.php
index 7ad5037..cfbe7e6 100644
--- a/src/Domain/Scraping/Infrastructure/ApiPlatform/State/Provider/ScrapingStatusStateProvider.php
+++ b/src/Domain/Scraping/Infrastructure/ApiPlatform/State/Provider/ScrapingStatusStateProvider.php
@@ -24,13 +24,13 @@ final readonly class ScrapingStatusStateProvider implements ProviderInterface
         }
 
         $progress = 0;
-        if ($job->getTotalPages() > 0) {
-            $progress = (count($job->getPages()) / $job->getTotalPages()) * 100;
+        if ($job->totalPages > 0) {
+            $progress = (count($job->pages) / $job->totalPages) * 100;
         }
 
         return new ScrapingStatusResponse(
             jobId: $job->getId(),
-            status: $job->getStatus()->value,
+            status: $job->status->value,
             progress: $progress
         );
     }
diff --git a/src/Domain/Scraping/Infrastructure/Persistence/DoctrineScrapingJobRepository.php b/src/Domain/Scraping/Infrastructure/Persistence/DoctrineScrapingJobRepository.php
index f0f3266..ef6438f 100644
--- a/src/Domain/Scraping/Infrastructure/Persistence/DoctrineScrapingJobRepository.php
+++ b/src/Domain/Scraping/Infrastructure/Persistence/DoctrineScrapingJobRepository.php
@@ -17,8 +17,19 @@ readonly class DoctrineScrapingJobRepository implements ScrapingJobRepositoryInt
 
     public function save(ScrapingJob $job): void
     {
-        $entity = ScrapingJobEntity::fromDomain($job);
-        $this->entityManager->persist($entity);
+        $existingEntity = $this->entityManager->getRepository(ScrapingJobEntity::class)->find($job->getId());
+
+        if ($existingEntity) {
+            $existingEntity->setStatus($job->status->value);
+            $existingEntity->setPages($job->pages);
+            $existingEntity->setCompletedAt($job->completedAt);
+            $existingEntity->setCbzPath($job->cbzPath?->getPath());
+            $existingEntity->setFailureReason($job->failureReason);
+        } else {
+            $entity = ScrapingJobEntity::fromDomain($job);
+            $this->entityManager->persist($entity);
+        }
+
         $this->entityManager->flush();
     }
 
diff --git a/src/Domain/Scraping/Infrastructure/Persistence/Entity/ScrapingJobEntity.php b/src/Domain/Scraping/Infrastructure/Persistence/Entity/ScrapingJobEntity.php
index c2f21c0..b06b1d5 100644
--- a/src/Domain/Scraping/Infrastructure/Persistence/Entity/ScrapingJobEntity.php
+++ b/src/Domain/Scraping/Infrastructure/Persistence/Entity/ScrapingJobEntity.php
@@ -3,6 +3,7 @@
 namespace App\Domain\Scraping\Infrastructure\Persistence\Entity;
 
 use App\Domain\Scraping\Domain\Model\ScrapingJob;
+use App\Domain\Scraping\Domain\Model\ScrapingStatus;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
@@ -28,6 +29,12 @@ class ScrapingJobEntity
     #[ORM\Column(type: 'string')]
     private string $status;
 
+    #[ORM\Column(type: 'string', nullable: true)]
+    private ?string $cbzPath = null;
+
+    #[ORM\Column(type: 'string', nullable: true)]
+    private ?string $failureReason = '';
+
     #[ORM\Column(type: 'datetime_immutable')]
     private \DateTimeImmutable $createdAt;
 
@@ -41,11 +48,12 @@ class ScrapingJobEntity
         $entity->chapterNumber = $job->getChapterNumber();
         $entity->mangaId = $job->getMangaId();
         $entity->sourceId = $job->getSourceId();
-        $entity->pages = $job->getPages();
-        $entity->status = $job->getStatus()->value;
-        $entity->createdAt = $job->getCreatedAt();
-        $entity->completedAt = $job->getCompletedAt();
-
+        $entity->pages = $job->pages;
+        $entity->status = $job->status->value;
+        $entity->createdAt = $job->createdAt;
+        $entity->completedAt = $job->completedAt;
+        $entity->cbzPath = $job->cbzPath?->getPath();
+        $entity->failureReason = $job->failureReason;
         return $entity;
     }
 
@@ -58,6 +66,38 @@ class ScrapingJobEntity
             sourceId: $this->sourceId
         );
 
+        $job->status = ScrapingStatus::from($this->status);
+        $job->pages = $this->pages;
+        $job->createdAt = $this->createdAt;
+        $job->completedAt = $this->completedAt;
+        $job->cbzPath = $this->cbzPath;
+        $job->failureReason = $this->failureReason;
+
         return $job;
     }
+
+    public function setStatus(string $status): void
+    {
+        $this->status = $status;
+    }
+
+    public function setPages(array $pages): void
+    {
+        $this->pages = $pages;
+    }
+
+    public function setCompletedAt(\DateTimeImmutable $completedAt): void
+    {
+        $this->completedAt = $completedAt;
+    }
+
+    public function setCbzPath(?string $cbzPath = null): void
+    {
+        $this->cbzPath = $cbzPath;
+    }
+
+    public function setFailureReason(string $failureReason): void
+    {
+        $this->failureReason = $failureReason;
+    }
 }
diff --git a/src/Domain/Scraping/Infrastructure/Persistence/LegacyChapterRepository.php b/src/Domain/Scraping/Infrastructure/Persistence/LegacyChapterRepository.php
new file mode 100644
index 0000000..2c7e785
--- /dev/null
+++ b/src/Domain/Scraping/Infrastructure/Persistence/LegacyChapterRepository.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Domain\Scraping\Infrastructure\Persistence;
+
+use App\Domain\Scraping\Domain\Contract\Repository\ChapterRepositoryInterface;
+use App\Domain\Scraping\Domain\Exception\ChapterNotFoundException;
+use App\Domain\Scraping\Domain\Model\Chapter;
+use App\Entity\Chapter as EntityChapter;
+use Doctrine\ORM\EntityManagerInterface;
+class LegacyChapterRepository implements ChapterRepositoryInterface
+{
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {}
+
+    public function getByMangaIdAndChapterNumber(string $mangaId, int $chapterNumber): Chapter
+    {
+        $chapterEntity = $this->entityManager->getRepository(EntityChapter::class)->findOneBy([
+            'manga' => $mangaId,
+            'number' => $chapterNumber,
+        ]);
+
+        if (!$chapterEntity) {
+            throw new ChapterNotFoundException();
+        }
+
+        return new Chapter(
+            id: $chapterEntity->getId(),
+            mangaId: $chapterEntity->getManga()->getId(),
+            chapterNumber: $chapterEntity->getNumber(),
+            volumeNumber: $chapterEntity->getVolume(),
+        );
+    }
+}
diff --git a/src/Domain/Scraping/Infrastructure/Persistence/LegacyMangaRepository.php b/src/Domain/Scraping/Infrastructure/Persistence/LegacyMangaRepository.php
index 50a7028..66675f7 100644
--- a/src/Domain/Scraping/Infrastructure/Persistence/LegacyMangaRepository.php
+++ b/src/Domain/Scraping/Infrastructure/Persistence/LegacyMangaRepository.php
@@ -25,6 +25,7 @@ readonly class LegacyMangaRepository implements MangaRepositoryInterface
             $mangaEntity->getSlug(),
             $mangaEntity->getDescription(),
             $mangaEntity->getAuthor(),
+            $mangaEntity->getPublicationYear(),
         ) : null;
     }
 }
diff --git a/src/Domain/Scraping/Infrastructure/Service/CbzGenerator.php b/src/Domain/Scraping/Infrastructure/Service/CbzGenerator.php
new file mode 100644
index 0000000..8a2d900
--- /dev/null
+++ b/src/Domain/Scraping/Infrastructure/Service/CbzGenerator.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Domain\Scraping\Infrastructure\Service;
+
+use App\Domain\Scraping\Domain\Contract\Repository\ChapterRepositoryInterface;
+use App\Domain\Scraping\Domain\Contract\Repository\MangaRepositoryInterface;
+use App\Domain\Scraping\Domain\Model\Manga;
+use App\Domain\Scraping\Domain\Model\ScrapingJob;
+use App\Domain\Scraping\Domain\Model\ValueObject\CbzPath;
+use App\Domain\Scraping\Domain\Contract\Service\CbzGeneratorInterface;
+use App\Domain\Scraping\Domain\Model\Chapter;
+use App\Domain\Scraping\Domain\Model\ValueObject\TempDirectory;
+use App\Domain\Scraping\Domain\Exception\CbzGenerationException;
+use Exception;
+
+readonly class CbzGenerator implements CbzGeneratorInterface
+{
+    public function __construct(
+        private string                     $projectDir,
+        private MangaRepositoryInterface   $mangaRepository,
+        private ChapterRepositoryInterface $chapterRepository,
+    ) {}
+
+    /**
+     * @throws Exception
+     */
+    public function generate(ScrapingJob $job, TempDirectory $tempDirectory): CbzPath
+    {
+        $cbzPath = $this->generateCbzPath($job);
+        $this->createCbzArchive($tempDirectory->getPath(), $cbzPath);
+
+        return new CbzPath($cbzPath);
+    }
+
+    private function generateCbzPath(ScrapingJob $job): string
+    {
+        $manga = $this->mangaRepository->getById($job->getMangaId());
+        $chapter = $this->chapterRepository->getByMangaIdAndChapterNumber($job->getMangaId(), $job->getChapterNumber());
+
+        $baseDir = sprintf(
+            '%s/public/cbz/%s/%s',
+            $this->projectDir,
+            $manga->getTitle() . ' (' . $manga->getPublicationYear() . ')',
+            sprintf('volume_%02d', $chapter->volumeNumber)
+        );
+
+        try {
+            if (!is_dir($baseDir)) {
+                if (!mkdir($baseDir, 0755, true)) {
+                    throw new CbzGenerationException();
+                }
+            }
+        } catch (Exception $e) {
+            throw CbzGenerationException::unableToCreateDirectory($baseDir);
+        }
+
+        $chapterNumber = $job->getChapterNumber();
+        $formattedNumber = $chapterNumber == floor($chapterNumber)
+            ? sprintf('%02d', (int)$chapterNumber)
+            : sprintf('%04.1f', $chapterNumber);
+
+        return sprintf(
+            '%s/%s_vol%s_ch%s.cbz',
+            $baseDir,
+            strtolower($manga->getTitle()),
+            sprintf('%02d', $chapter->volumeNumber),
+            $formattedNumber
+        );
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function createCbzArchive(string $sourceDirectory, string $destinationPath): void
+    {
+        $zip = new \ZipArchive();
+
+        if ($zip->open($destinationPath, \ZipArchive::CREATE) !== true) {
+            throw CbzGenerationException::unableToCreateCbz($destinationPath);
+        }
+
+        try {
+            $files = new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($sourceDirectory),
+                \RecursiveIteratorIterator::LEAVES_ONLY
+            );
+
+            foreach ($files as $file) {
+                if (!$file->isDir()) {
+                    $filePath = $file->getRealPath();
+                    $relativePath = substr($filePath, strlen($sourceDirectory) + 1);
+                    if (!$zip->addFile($filePath, $relativePath)) {
+                        throw CbzGenerationException::unableToAddFileToArchive($filePath);
+                    }
+                }
+            }
+        } catch (Exception $e) {
+            $zip->close();
+            throw $e;
+        }
+
+        $zip->close();
+    }
+}
diff --git a/src/Domain/Scraping/Infrastructure/Service/ImageDownloader.php b/src/Domain/Scraping/Infrastructure/Service/ImageDownloader.php
index fffaea7..d42c435 100644
--- a/src/Domain/Scraping/Infrastructure/Service/ImageDownloader.php
+++ b/src/Domain/Scraping/Infrastructure/Service/ImageDownloader.php
@@ -3,7 +3,7 @@
 namespace App\Domain\Scraping\Infrastructure\Service;
 
 use Symfony\Contracts\HttpClient\HttpClientInterface;
-use App\Domain\Scraping\Domain\Contract\Service\ImageDownloader as ImageDownloaderInterface;
+use App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface;
 
 readonly class ImageDownloader implements ImageDownloaderInterface
 {
diff --git a/src/Domain/Scraping/Infrastructure/Service/Scraper/AbstractScraper.php b/src/Domain/Scraping/Infrastructure/Service/Scraper/AbstractScraper.php
index e0262d0..9ba3c6e 100644
--- a/src/Domain/Scraping/Infrastructure/Service/Scraper/AbstractScraper.php
+++ b/src/Domain/Scraping/Infrastructure/Service/Scraper/AbstractScraper.php
@@ -2,25 +2,25 @@
 
 namespace App\Domain\Scraping\Infrastructure\Service\Scraper;
 
+use App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface;
 use App\Domain\Scraping\Domain\Contract\Service\ScraperInterface;
 use App\Domain\Scraping\Domain\Event\PageScrapingProgressed;
 use App\Domain\Scraping\Domain\Model\ScrapingJob;
 use App\Domain\Scraping\Domain\Model\ScrapingProgress;
 use App\Domain\Scraping\Domain\Model\Source;
 use App\Domain\Scraping\Domain\Model\ValueObject\TempDirectory;
-use App\Domain\Scraping\Infrastructure\Service\ImageDownloader;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Ramsey\Uuid\Uuid;
 
 abstract class AbstractScraper implements ScraperInterface
 {
     public function __construct(
-        protected readonly ImageDownloader $imageDownloader,
-        protected readonly MessageBusInterface $eventBus
+        protected ImageDownloaderInterface $imageDownloader,
+        protected MessageBusInterface $eventBus
     ) {
     }
 
-    abstract public function scrape(ScrapingJob $job): void;
+    abstract public function scrape(ScrapingJob $job): ScrapingJob;
 
     abstract protected function scrapePages(ScrapingJob $job, Source $source): array;
 
diff --git a/src/Domain/Scraping/Infrastructure/Service/Scraper/HtmlScraper.php b/src/Domain/Scraping/Infrastructure/Service/Scraper/HtmlScraper.php
index c423f43..8bafdb6 100644
--- a/src/Domain/Scraping/Infrastructure/Service/Scraper/HtmlScraper.php
+++ b/src/Domain/Scraping/Infrastructure/Service/Scraper/HtmlScraper.php
@@ -9,26 +9,27 @@ use App\Domain\Scraping\Domain\Model\Source;
 use App\Domain\Scraping\Domain\Model\ValueObject\ImageUrl;
 use App\Domain\Scraping\Domain\Model\ValueObject\PageNumber;
 use App\Domain\Scraping\Domain\Contract\Repository\SourceRepositoryInterface;
+use App\Domain\Scraping\Domain\Contract\Service\CbzGeneratorInterface;
+use App\Domain\Scraping\Domain\Contract\Service\ImageDownloaderInterface;
 use App\Domain\Scraping\Domain\Model\ValueObject\ChapterUrl;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
-use App\Domain\Scraping\Infrastructure\Service\ImageDownloader;
 
 class HtmlScraper extends AbstractScraper
 {
     public function __construct(
-        ImageDownloader $imageDownloader,
-        MessageBusInterface $eventBus,
-        private readonly HttpClientInterface $httpClient,
+        ImageDownloaderInterface                   $imageDownloader,
+        MessageBusInterface                        $eventBus,
+        private readonly CbzGeneratorInterface     $cbzGenerator,
+        private readonly HttpClientInterface       $httpClient,
         private readonly SourceRepositoryInterface $sourceRepository,
-        private readonly MangaRepositoryInterface $mangaRepository,
-        private readonly ScrapingJobRepositoryInterface $scrapingJobRepository,
+        private readonly MangaRepositoryInterface  $mangaRepository,
     ) {
         parent::__construct($imageDownloader, $eventBus);
     }
 
-    public function scrape(ScrapingJob $job): void
+    public function scrape(ScrapingJob $job): ScrapingJob
     {
         $sourceConfig = $this->sourceRepository->getById($job->getSourceId());
         $tempDir = $this->createTempDirectory();
@@ -52,12 +53,14 @@ class HtmlScraper extends AbstractScraper
                 $this->dispatchProgressEvent($job, $index + 1, count($pages));
             }
 
+            $cbzPath = $this->cbzGenerator->generate($job, $tempDir);
+
+            $job->cbzPath = $cbzPath;
             $job->complete();
-            $this->scrapingJobRepository->save($job);
+            return $job;
         } catch (\Exception $e) {
-            $job->fail();
-            $this->scrapingJobRepository->save($job);
-            throw $e;
+            $job->fail($e->getMessage());
+            return $job;
         } finally {
             $this->cleanupTempFiles($tempDir);
         }
diff --git a/tests/Domain/Scraping/Adapter/InMemoryCbzGenerator.php b/tests/Domain/Scraping/Adapter/InMemoryCbzGenerator.php
new file mode 100644
index 0000000..1a842aa
--- /dev/null
+++ b/tests/Domain/Scraping/Adapter/InMemoryCbzGenerator.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Tests\Domain\Scraping\Adapter;
+
+use App\Domain\Scraping\Domain\Contract\Service\CbzGeneratorInterface;
+use App\Domain\Scraping\Domain\Model\ScrapingJob;
+use App\Domain\Scraping\Domain\Model\ValueObject\CbzPath;
+use App\Domain\Scraping\Domain\Model\ValueObject\TempDirectory;
+
+readonly class InMemoryCbzGenerator implements CbzGeneratorInterface
+{
+    public function __construct(private string $projectDir)
+    {
+    }
+
+    public function generate(ScrapingJob $job, TempDirectory $tempDirectory): CbzPath
+    {
+        return new CbzPath('test.cbz');
+    }
+}
diff --git a/tests/Domain/Scraping/Adapter/InMemoryScraperAdapter.php b/tests/Domain/Scraping/Adapter/InMemoryScraperAdapter.php
index cf53903..205f0f8 100644
--- a/tests/Domain/Scraping/Adapter/InMemoryScraperAdapter.php
+++ b/tests/Domain/Scraping/Adapter/InMemoryScraperAdapter.php
@@ -10,11 +10,15 @@ class InMemoryScraperAdapter implements ScraperInterface
 {
     private ?\Exception $shouldThrowException = null;
 
-    public function scrape(ScrapingJob $job): void
+    public function scrape(ScrapingJob $job): ScrapingJob
     {
         if ($this->shouldThrowException) {
-            throw $this->shouldThrowException;
+            $job->fail($this->shouldThrowException->getMessage());
+            return $job;
         }
+
+        $job->complete();
+        return $job;
     }
 
     public function simulateError(\Exception $exception): void
diff --git a/tests/Domain/Scraping/Adapter/InMemoryScrapingJobRepository.php b/tests/Domain/Scraping/Adapter/InMemoryScrapingJobRepository.php
index 8068b07..fcae1b9 100644
--- a/tests/Domain/Scraping/Adapter/InMemoryScrapingJobRepository.php
+++ b/tests/Domain/Scraping/Adapter/InMemoryScrapingJobRepository.php
@@ -12,23 +12,17 @@ class InMemoryScrapingJobRepository implements ScrapingJobRepositoryInterface
 
     public function save(ScrapingJob $job): void
     {
-        self::$jobs[] = $job;
+        self::$jobs[$job->getId()] = $job;
     }
 
     public function getJobs(): array
     {
-        return self::$jobs;
+        return array_values(self::$jobs);
     }
 
     public function findById(string $id): ?ScrapingJob
     {
-        foreach (self::$jobs as $job) {
-            if ($job->getId() === $id) {
-                return $job;
-            }
-        }
-
-        return null;
+        return self::$jobs[$id] ?? null;
     }
 
     public function findByChapterId(string $chapterId): ?ScrapingJob
@@ -46,4 +40,4 @@ class InMemoryScrapingJobRepository implements ScrapingJobRepositoryInterface
     {
         self::$jobs = [];
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandlerTest.php b/tests/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandlerTest.php
index 07aafbe..9392d7b 100644
--- a/tests/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandlerTest.php
+++ b/tests/Domain/Scraping/Application/CommandHandler/ScrapeChapterHandlerTest.php
@@ -4,8 +4,10 @@ namespace App\Tests\Domain\Scraping\Application\CommandHandler;
 
 use App\Domain\Scraping\Application\Command\ScrapeChapter;
 use App\Domain\Scraping\Application\CommandHandler\ScrapeChapterHandler;
+use App\Domain\Scraping\Domain\Event\ChapterScraped;
 use App\Domain\Scraping\Domain\Event\ChapterScrapingFailed;
 use App\Domain\Scraping\Domain\Event\ChapterScrapingStarted;
+use App\Domain\Scraping\Domain\Model\ScrapingStatus;
 use App\Tests\Domain\Scraping\Adapter\InMemoryEventBus;
 use App\Tests\Domain\Scraping\Adapter\InMemoryScraperAdapter;
 use App\Tests\Domain\Scraping\Adapter\InMemoryScrapingJobRepository;
@@ -41,17 +43,18 @@ class ScrapeChapterHandlerTest extends TestCase
         $this->handler->handle($command);
 
         $scrapingJobs = $this->repository->getJobs();
+
+
         $this->assertCount(1, $scrapingJobs);
         $job = $scrapingJobs[0];
 
-        $savedJobs = $this->repository->getJobs();
-        $this->assertCount(1, $savedJobs);
-        $this->assertSame($job, $savedJobs[0]);
-
         $dispatchedMessages = $this->eventBus->getDispatchedMessages();
-        $this->assertCount(1, $dispatchedMessages);
+        $this->assertCount(2, $dispatchedMessages);
         $this->assertInstanceOf(ChapterScrapingStarted::class, $dispatchedMessages[0]);
+        $this->assertInstanceOf(ChapterScraped::class, $dispatchedMessages[1]);
         $this->assertEquals($job->getId(), $dispatchedMessages[0]->getJobId());
+
+        $this->repository->clear();
     }
 
     public function testHandleThrowsException(): void
@@ -65,18 +68,18 @@ class ScrapeChapterHandlerTest extends TestCase
         $exception = new \Exception('Scraping failed');
         $this->scraper->simulateError($exception);
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Scraping failed');
+        $this->handler->handle($command);
 
-        try {
-            $this->handler->handle($command);
-        } finally {
-            $dispatchedMessages = $this->eventBus->getDispatchedMessages();
-            $this->assertCount(2, $dispatchedMessages);
-            $this->assertInstanceOf(ChapterScrapingStarted::class, $dispatchedMessages[0]);
-            $this->assertInstanceOf(ChapterScrapingFailed::class, $dispatchedMessages[1]);
-            $this->assertEquals(2, $dispatchedMessages[1]->getChapterNumber());
-            $this->assertEquals('Scraping failed', $dispatchedMessages[1]->getReason());
-        }
+        $dispatchedMessages = $this->eventBus->getDispatchedMessages();
+        $this->assertCount(2, $dispatchedMessages);
+        $this->assertInstanceOf(ChapterScrapingStarted::class, $dispatchedMessages[0]);
+        $this->assertInstanceOf(ChapterScrapingFailed::class, $dispatchedMessages[1]);
+        $this->assertEquals(2, $dispatchedMessages[1]->getChapterNumber());
+        $this->assertEquals('Scraping failed', $dispatchedMessages[1]->getReason());
+
+        $jobs = $this->repository->getJobs();
+        $this->assertCount(1, $jobs);
+        $this->assertEquals(ScrapingStatus::FAILED, $jobs[0]->status);
+        $this->assertEquals('Scraping failed', $jobs[0]->failureReason);
     }
 }