diff --git a/src/Domain/Manga/Application/CommandHandler/CreateMangaFromMangadexHandler.php b/src/Domain/Manga/Application/CommandHandler/CreateMangaFromMangadexHandler.php
index a25c27f..a05d9f9 100644
--- a/src/Domain/Manga/Application/CommandHandler/CreateMangaFromMangadexHandler.php
+++ b/src/Domain/Manga/Application/CommandHandler/CreateMangaFromMangadexHandler.php
@@ -10,7 +10,7 @@ use App\Domain\Manga\Domain\Event\MangaCreated;
 use App\Domain\Manga\Domain\Exception\MangaNotFoundException;
 use App\Domain\Manga\Domain\Model\ValueObject\ExternalId;
 use App\Domain\Manga\Domain\Model\ValueObject\ImageUrls;
-use Symfony\Component\Messenger\MessageBusInterface;
+use App\Domain\Shared\Domain\Contract\EventDispatcherInterface;
 
 readonly class CreateMangaFromMangadexHandler
 {
@@ -18,7 +18,7 @@ readonly class CreateMangaFromMangadexHandler
         private MangaProviderInterface $mangaProvider,
         private MangaRepositoryInterface $mangaRepository,
         private ImageProcessorInterface $imageProcessor,
-        private MessageBusInterface $messageBus
+        private EventDispatcherInterface $eventDispatcher
     ) {}
 
     public function handle(CreateMangaFromMangadex $command): void
@@ -44,6 +44,6 @@ readonly class CreateMangaFromMangadexHandler
 
         $this->mangaRepository->save($manga);
 
-        $this->messageBus->dispatch(new MangaCreated($manga->getId()->getValue(), $command->externalId));
+        $this->eventDispatcher->dispatch(new MangaCreated($manga->getId()->getValue(), $command->externalId));
     }
 }
diff --git a/src/Domain/Manga/Infrastructure/EventListener/MangaCreatedListener.php b/src/Domain/Manga/Application/EventListener/MangaCreatedEventListener.php
similarity index 55%
rename from src/Domain/Manga/Infrastructure/EventListener/MangaCreatedListener.php
rename to src/Domain/Manga/Application/EventListener/MangaCreatedEventListener.php
index 6cb5f88..bc20e4e 100644
--- a/src/Domain/Manga/Infrastructure/EventListener/MangaCreatedListener.php
+++ b/src/Domain/Manga/Application/EventListener/MangaCreatedEventListener.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Domain\Manga\Infrastructure\EventListener;
+namespace App\Domain\Manga\Application\EventListener;
 
 use App\Domain\Manga\Application\Command\FetchMangaChapters;
+use App\Domain\Manga\Application\CommandHandler\FetchMangaChaptersHandler;
 use App\Domain\Manga\Domain\Event\MangaCreated;
 use App\Domain\Manga\Domain\Model\ValueObject\MangaId;
-use Symfony\Component\Messenger\MessageBusInterface;
 
-readonly class MangaCreatedListener
+readonly class MangaCreatedEventListener
 {
     public function __construct(
-        private MessageBusInterface $messageBus
+        private FetchMangaChaptersHandler $fetchMangaChaptersHandler
     ) {}
 
     public function __invoke(MangaCreated $event): void
     {
-        $this->messageBus->dispatch(
+        $this->fetchMangaChaptersHandler->handle(
             new FetchMangaChapters(new MangaId($event->mangaId))
         );
     }
diff --git a/src/Domain/Manga/Infrastructure/MessageHandler/MangaCreatedMessageHandler.php b/src/Domain/Manga/Infrastructure/MessageHandler/MangaCreatedMessageHandler.php
new file mode 100644
index 0000000..cfdb6bb
--- /dev/null
+++ b/src/Domain/Manga/Infrastructure/MessageHandler/MangaCreatedMessageHandler.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Domain\Manga\Infrastructure\MessageHandler;
+
+use App\Domain\Manga\Application\EventListener\MangaCreatedEventListener;
+use App\Domain\Manga\Domain\Event\MangaCreated;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+#[AsMessageHandler]
+readonly class MangaCreatedMessageHandler
+{
+    public function __construct(private MangaCreatedEventListener $listener)
+    {
+    }
+
+    public function __invoke(MangaCreated $event): void
+    {
+        $this->listener->__invoke($event);
+    }
+}
diff --git a/src/Domain/Shared/Domain/Contract/EventDispatcherInterface.php b/src/Domain/Shared/Domain/Contract/EventDispatcherInterface.php
new file mode 100644
index 0000000..832a0f2
--- /dev/null
+++ b/src/Domain/Shared/Domain/Contract/EventDispatcherInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Domain\Shared\Domain\Contract;
+
+interface EventDispatcherInterface
+{
+    public function dispatch(object $event): void;
+}
diff --git a/src/Domain/Shared/Infrastructure/Messenger/SymfonyMessengerEventDispatcher.php b/src/Domain/Shared/Infrastructure/Messenger/SymfonyMessengerEventDispatcher.php
new file mode 100644
index 0000000..daf7553
--- /dev/null
+++ b/src/Domain/Shared/Infrastructure/Messenger/SymfonyMessengerEventDispatcher.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Domain\Shared\Infrastructure\Messenger;
+use App\Domain\Shared\Domain\Contract\EventDispatcherInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+class SymfonyMessengerEventDispatcher implements EventDispatcherInterface
+{
+    public function __construct(private MessageBusInterface $bus)
+    {
+    }
+
+    public function dispatch(object $event): void
+    {
+        $this->bus->dispatch($event);
+    }
+}