diff --git a/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php b/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
index 6907c6412..0ba9dcf2e 100644
--- a/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
+++ b/pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php
@@ -8,11 +8,12 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
-class EnqueueExtension extends Extension
+class EnqueueExtension extends Extension implements PrependExtensionInterface
 {
     /**
      * @var TransportFactoryInterface[]
@@ -132,4 +133,43 @@ public function getConfiguration(array $config, ContainerBuilder $container)
 
         return new Configuration($this->factories);
     }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        $this->registerJobQueueDoctrineEntityMapping($container);
+    }
+
+    private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $container)
+    {
+        if (false == class_exists(Job::class)) {
+            return;
+        }
+
+        $bundles = $container->getParameter('kernel.bundles');
+
+        if (false == isset($bundles['DoctrineBundle'])) {
+            return;
+        }
+
+        foreach ($container->getExtensionConfig('doctrine') as $config) {
+            // do not register mappings if dbal not configured.
+            if (false == empty($config['dbal'])) {
+                $rc = new \ReflectionClass(Job::class);
+                $jobQueueRootDir = dirname($rc->getFileName());
+                $container->prependExtensionConfig('doctrine', [
+                    'orm' => [
+                        'mappings' => [
+                            'enqueue_job_queue' => [
+                                'is_bundle' => false,
+                                'type' => 'xml',
+                                'dir' => $jobQueueRootDir.'/Doctrine/mapping',
+                                'prefix' => 'Enqueue\JobQueue\Doctrine\Entity',
+                            ],
+                        ],
+                    ],
+                ]);
+                break;
+            }
+        }
+    }
 }
diff --git a/pkg/enqueue-bundle/Entity/Job.php b/pkg/enqueue-bundle/Entity/Job.php
deleted file mode 100644
index 38abf755e..000000000
--- a/pkg/enqueue-bundle/Entity/Job.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Enqueue\Bundle\Entity;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\ORM\Mapping as ORM;
-use Enqueue\JobQueue\Job as BaseJob;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="enqueue_job")
- */
-class Job extends BaseJob
-{
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="owner_id", type="string", nullable=true)
-     */
-    protected $ownerId;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="name", type="string", nullable=false)
-     */
-    protected $name;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="status", type="string", nullable=false)
-     */
-    protected $status;
-
-    /**
-     * @var bool
-     *
-     * @ORM\Column(name="interrupted", type="boolean")
-     */
-    protected $interrupted;
-
-    /**
-     * @var bool;
-     *
-     * @ORM\Column(name="`unique`", type="boolean")
-     */
-    protected $unique;
-
-    /**
-     * @var Job
-     *
-     * @ORM\ManyToOne(targetEntity="Job", inversedBy="childJobs")
-     * @ORM\JoinColumn(name="root_job_id", referencedColumnName="id", onDelete="CASCADE")
-     */
-    protected $rootJob;
-
-    /**
-     * @var Job[]
-     *
-     * @ORM\OneToMany(targetEntity="Job", mappedBy="rootJob")
-     */
-    protected $childJobs;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="created_at", type="datetime", nullable=false)
-     */
-    protected $createdAt;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="started_at", type="datetime", nullable=true)
-     */
-    protected $startedAt;
-
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="stopped_at", type="datetime", nullable=true)
-     */
-    protected $stoppedAt;
-
-    /**
-     * @var array
-     *
-     * @ORM\Column(name="data", type="json_array", nullable=true)
-     */
-    protected $data;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->childJobs = new ArrayCollection();
-    }
-}
diff --git a/pkg/enqueue-bundle/Entity/JobUnique.php b/pkg/enqueue-bundle/Entity/JobUnique.php
deleted file mode 100644
index 3c7426bb9..000000000
--- a/pkg/enqueue-bundle/Entity/JobUnique.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Enqueue\Bundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table(name="enqueue_job_unique")
- */
-class JobUnique
-{
-    /**
-     * @ORM\Id
-     * @ORM\Column(name="name", type="string")
-     */
-    protected $name;
-}
diff --git a/pkg/enqueue-bundle/Resources/config/job.yml b/pkg/enqueue-bundle/Resources/config/job.yml
index 2d2a7b602..8a0f5f5a1 100644
--- a/pkg/enqueue-bundle/Resources/config/job.yml
+++ b/pkg/enqueue-bundle/Resources/config/job.yml
@@ -3,10 +3,10 @@ parameters:
 
 services:
     enqueue.job.storage:
-        class: 'Enqueue\JobQueue\JobStorage'
+        class: 'Enqueue\JobQueue\Doctrine\JobStorage'
         arguments:
             - '@doctrine'
-            - 'Enqueue\Bundle\Entity\Job'
+            - 'Enqueue\JobQueue\Doctrine\Entity\Job'
             - '%enqueue.job.unique_job_table_name%'
 
     enqueue.job.processor:
diff --git a/pkg/enqueue-bundle/Tests/Functional/Job/JobStorageTest.php b/pkg/enqueue-bundle/Tests/Functional/Job/JobStorageTest.php
index 93cff10a2..9bfd0ca38 100644
--- a/pkg/enqueue-bundle/Tests/Functional/Job/JobStorageTest.php
+++ b/pkg/enqueue-bundle/Tests/Functional/Job/JobStorageTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\Bundle\Tests\Functional\Job;
 
 use Enqueue\Bundle\Tests\Functional\WebTestCase;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 /**
  * @group functional
diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php
index f7d1c9352..84210f390 100644
--- a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php
+++ b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php
@@ -434,4 +434,32 @@ public function testShouldNotLoadSignalExtensionServiceIfDisabled()
 
         self::assertFalse($container->hasDefinition('enqueue.consumption.signal_extension'));
     }
+
+    public function testShouldAddJobQueueEntityMapping()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles', ['DoctrineBundle' => true]);
+        $container->prependExtensionConfig('doctrine', ['dbal' => true]);
+
+        $extension = new EnqueueExtension();
+
+        $extension->prepend($container);
+
+        $config =  $container->getExtensionConfig('doctrine');
+
+        $this->assertSame(['dbal' => true], $config[1]);
+        $this->assertNotEmpty($config[0]['orm']['mappings']['enqueue_job_queue']);
+    }
+
+    public function testShouldNotAddJobQueueEntityMappingIfDoctrineBundleIsNotRegistered()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.bundles', []);
+
+        $extension = new EnqueueExtension();
+
+        $extension->prepend($container);
+
+        $this->assertSame([], $container->getExtensionConfig('doctrine'));
+    }
 }
diff --git a/pkg/job-queue/CalculateRootJobStatusProcessor.php b/pkg/job-queue/CalculateRootJobStatusProcessor.php
index b2a8aab3a..cdc27a44d 100644
--- a/pkg/job-queue/CalculateRootJobStatusProcessor.php
+++ b/pkg/job-queue/CalculateRootJobStatusProcessor.php
@@ -5,6 +5,7 @@
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Consumption\Result;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\Psr\PsrContext;
 use Enqueue\Psr\PsrMessage;
 use Enqueue\Psr\PsrProcessor;
diff --git a/pkg/job-queue/CalculateRootJobStatusService.php b/pkg/job-queue/CalculateRootJobStatusService.php
index ae54315da..af4631e2a 100644
--- a/pkg/job-queue/CalculateRootJobStatusService.php
+++ b/pkg/job-queue/CalculateRootJobStatusService.php
@@ -3,6 +3,7 @@
 namespace Enqueue\JobQueue;
 
 use Doctrine\Common\Collections\Collection;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 class CalculateRootJobStatusService
 {
diff --git a/pkg/job-queue/DependentJobProcessor.php b/pkg/job-queue/DependentJobProcessor.php
index c968e4271..e87918718 100644
--- a/pkg/job-queue/DependentJobProcessor.php
+++ b/pkg/job-queue/DependentJobProcessor.php
@@ -6,6 +6,7 @@
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Consumption\Result;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\Psr\PsrContext;
 use Enqueue\Psr\PsrMessage;
 use Enqueue\Psr\PsrProcessor;
diff --git a/pkg/job-queue/DependentJobService.php b/pkg/job-queue/DependentJobService.php
index e0d42b961..b6066d669 100644
--- a/pkg/job-queue/DependentJobService.php
+++ b/pkg/job-queue/DependentJobService.php
@@ -2,6 +2,8 @@
 
 namespace Enqueue\JobQueue;
 
+use Enqueue\JobQueue\Doctrine\JobStorage;
+
 class DependentJobService
 {
     /**
diff --git a/pkg/job-queue/Doctrine/Entity/Job.php b/pkg/job-queue/Doctrine/Entity/Job.php
new file mode 100644
index 000000000..7dcfcb477
--- /dev/null
+++ b/pkg/job-queue/Doctrine/Entity/Job.php
@@ -0,0 +1,15 @@
+<?php
+namespace Enqueue\JobQueue\Doctrine\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Enqueue\JobQueue\Job as BaseJob;
+
+class Job extends BaseJob
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->childJobs = new ArrayCollection();
+    }
+}
diff --git a/pkg/job-queue/Doctrine/Entity/JobUnique.php b/pkg/job-queue/Doctrine/Entity/JobUnique.php
new file mode 100644
index 000000000..dfa622432
--- /dev/null
+++ b/pkg/job-queue/Doctrine/Entity/JobUnique.php
@@ -0,0 +1,7 @@
+<?php
+namespace Enqueue\JobQueue\Doctrine\Entity;
+
+class JobUnique
+{
+    protected $name;
+}
diff --git a/pkg/job-queue/JobStorage.php b/pkg/job-queue/Doctrine/JobStorage.php
similarity index 98%
rename from pkg/job-queue/JobStorage.php
rename to pkg/job-queue/Doctrine/JobStorage.php
index 2985269ba..c84c284e6 100644
--- a/pkg/job-queue/JobStorage.php
+++ b/pkg/job-queue/Doctrine/JobStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\JobQueue;
+namespace Enqueue\JobQueue\Doctrine;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
@@ -8,6 +8,8 @@
 use Doctrine\DBAL\LockMode;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
+use Enqueue\JobQueue\DuplicateJobException;
+use Enqueue\JobQueue\Job;
 
 class JobStorage
 {
diff --git a/pkg/job-queue/Doctrine/mapping/Job.orm.xml b/pkg/job-queue/Doctrine/mapping/Job.orm.xml
new file mode 100644
index 000000000..e6fcbdde5
--- /dev/null
+++ b/pkg/job-queue/Doctrine/mapping/Job.orm.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="Enqueue\JobQueue\Doctrine\Entity\Job" table="enqueue_job">
+        <id name="id" type="integer">
+            <generator strategy="AUTO" />
+        </id>
+        <field name="ownerId" column="owner_id" type="string" nullable="true" />
+        <field name="name" column="name" type="string" nullable="false" />
+        <field name="status" column="status" type="string" nullable="false" />
+        <field name="interrupted" column="interrupted" type="boolean" />
+        <field name="unique" column="`unique`" type="boolean" />
+        <field name="createdAt" column="created_at" type="datetime" nullable="false" />
+        <field name="startedAt" column="started_at" type="datetime" nullable="true" />
+        <field name="stoppedAt" column="stopped_at" type="datetime" nullable="true" />
+        <field name="data" column="data" type="json_array" nullable="true" />
+        <many-to-one field="rootJob" target-entity="Enqueue\JobQueue\Doctrine\Entity\Job" inversed-by="childJobs">
+            <join-column name="root_job_id" referenced-column-name="id" on-delete="CASCADE" />
+        </many-to-one>
+        <one-to-many field="childJobs" target-entity="Enqueue\JobQueue\Doctrine\Entity\Job" mapped-by="rootJob" />
+    </entity>
+</doctrine-mapping>
diff --git a/pkg/job-queue/Doctrine/mapping/JobUnique.orm.xml b/pkg/job-queue/Doctrine/mapping/JobUnique.orm.xml
new file mode 100644
index 000000000..0b5496a58
--- /dev/null
+++ b/pkg/job-queue/Doctrine/mapping/JobUnique.orm.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+    <entity name="Enqueue\JobQueue\Doctrine\Entity\JobUnique" table="enqueue_job_unique">
+        <id name="name" type="string">
+            <generator strategy="AUTO" />
+        </id>
+    </entity>
+</doctrine-mapping>
diff --git a/pkg/job-queue/JobProcessor.php b/pkg/job-queue/JobProcessor.php
index 053f6aac2..f2272d7d6 100644
--- a/pkg/job-queue/JobProcessor.php
+++ b/pkg/job-queue/JobProcessor.php
@@ -3,6 +3,7 @@
 namespace Enqueue\JobQueue;
 
 use Enqueue\Client\ProducerInterface;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 class JobProcessor
 {
diff --git a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
index 63f0956c4..5cd162713 100644
--- a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
+++ b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
@@ -7,7 +7,7 @@
 use Enqueue\JobQueue\CalculateRootJobStatusProcessor;
 use Enqueue\JobQueue\CalculateRootJobStatusService;
 use Enqueue\JobQueue\Job;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\JobQueue\Topics;
 use Enqueue\Psr\PsrContext;
 use Enqueue\Null\NullMessage;
diff --git a/pkg/job-queue/Tests/CalculateRootJobStatusServiceTest.php b/pkg/job-queue/Tests/CalculateRootJobStatusServiceTest.php
index 47e2c6e21..d6229da36 100644
--- a/pkg/job-queue/Tests/CalculateRootJobStatusServiceTest.php
+++ b/pkg/job-queue/Tests/CalculateRootJobStatusServiceTest.php
@@ -4,7 +4,7 @@
 
 use Enqueue\JobQueue\CalculateRootJobStatusService;
 use Enqueue\JobQueue\Job;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 class CalculateRootJobStatusServiceTest extends \PHPUnit\Framework\TestCase
 {
@@ -356,7 +356,7 @@ public function testShouldSetStatusSuccessIfAllAreSuccess()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|JobStorage
+     * @return \PHPUnit_Framework_MockObject_MockObject|\Enqueue\JobQueue\Doctrine\JobStorage
      */
     private function createJobStorageMock()
     {
diff --git a/pkg/job-queue/Tests/DependentJobProcessorTest.php b/pkg/job-queue/Tests/DependentJobProcessorTest.php
index fc2b0b80d..94c51f967 100644
--- a/pkg/job-queue/Tests/DependentJobProcessorTest.php
+++ b/pkg/job-queue/Tests/DependentJobProcessorTest.php
@@ -7,7 +7,7 @@
 use Enqueue\Consumption\Result;
 use Enqueue\JobQueue\DependentJobProcessor;
 use Enqueue\JobQueue\Job;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\JobQueue\Topics;
 use Enqueue\Psr\PsrContext;
 use Enqueue\Null\NullMessage;
@@ -325,7 +325,7 @@ private function createContextMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|JobStorage
+     * @return \PHPUnit_Framework_MockObject_MockObject|\Enqueue\JobQueue\Doctrine\JobStorage
      */
     private function createJobStorageMock()
     {
diff --git a/pkg/job-queue/Tests/DependentJobServiceTest.php b/pkg/job-queue/Tests/DependentJobServiceTest.php
index 1f6f5796d..4b7156b19 100644
--- a/pkg/job-queue/Tests/DependentJobServiceTest.php
+++ b/pkg/job-queue/Tests/DependentJobServiceTest.php
@@ -5,7 +5,7 @@
 use Enqueue\JobQueue\DependentJobContext;
 use Enqueue\JobQueue\DependentJobService;
 use Enqueue\JobQueue\Job;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 class DependentJobServiceTest extends \PHPUnit\Framework\TestCase
 {
@@ -66,7 +66,7 @@ public function testShouldSaveDependentJobs()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|JobStorage
+     * @return \PHPUnit_Framework_MockObject_MockObject|\Enqueue\JobQueue\Doctrine\JobStorage
      */
     private function createJobStorageMock()
     {
diff --git a/pkg/job-queue/Tests/JobStorageTest.php b/pkg/job-queue/Tests/Doctrine/JobStorageTest.php
similarity index 99%
rename from pkg/job-queue/Tests/JobStorageTest.php
rename to pkg/job-queue/Tests/Doctrine/JobStorageTest.php
index ec1fc25ef..7302cc3ce 100644
--- a/pkg/job-queue/Tests/JobStorageTest.php
+++ b/pkg/job-queue/Tests/Doctrine/JobStorageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\JobQueue\Tests;
+namespace Enqueue\JobQueue\Tests\Doctrine;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
@@ -10,7 +10,7 @@
 use Doctrine\ORM\EntityRepository;
 use Enqueue\JobQueue\DuplicateJobException;
 use Enqueue\JobQueue\Job;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 
 class JobStorageTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/pkg/job-queue/Tests/Functional/Job/JobStorageTest.php b/pkg/job-queue/Tests/Functional/Job/JobStorageTest.php
index 9c739fdff..f5ee1c84b 100644
--- a/pkg/job-queue/Tests/Functional/Job/JobStorageTest.php
+++ b/pkg/job-queue/Tests/Functional/Job/JobStorageTest.php
@@ -3,7 +3,7 @@
 namespace Enqueue\JobQueue\Tests\Functional\Job;
 
 use Enqueue\JobQueue\DuplicateJobException;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\JobQueue\Tests\Functional\Entity\Job;
 use Enqueue\JobQueue\Tests\Functional\WebTestCase;
 
@@ -142,7 +142,7 @@ private function getEntityManager()
     }
 
     /**
-     * @return \Enqueue\JobQueue\JobStorage
+     * @return \Enqueue\JobQueue\Doctrine\JobStorage
      */
     private function getJobStorage()
     {
diff --git a/pkg/job-queue/Tests/JobProcessorTest.php b/pkg/job-queue/Tests/JobProcessorTest.php
index e1a7fd559..6e8b8b84c 100644
--- a/pkg/job-queue/Tests/JobProcessorTest.php
+++ b/pkg/job-queue/Tests/JobProcessorTest.php
@@ -6,7 +6,7 @@
 use Enqueue\JobQueue\DuplicateJobException;
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\JobProcessor;
-use Enqueue\JobQueue\JobStorage;
+use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\JobQueue\Topics;
 
 class JobProcessorTest extends \PHPUnit\Framework\TestCase