diff --git a/DependencyInjection/ChillMainExtension.php b/DependencyInjection/ChillMainExtension.php
index 53b1769a4..2eb6d1215 100644
--- a/DependencyInjection/ChillMainExtension.php
+++ b/DependencyInjection/ChillMainExtension.php
@@ -110,6 +110,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
+        $loader->load('services/doctrine.yaml');
         $loader->load('services/logger.yaml');
         $loader->load('services/repositories.yaml');
         $loader->load('services/pagination.yaml');
diff --git a/Doctrine/Migrations/VersionComparator.php b/Doctrine/Migrations/VersionComparator.php
new file mode 100644
index 000000000..120d621a0
--- /dev/null
+++ b/Doctrine/Migrations/VersionComparator.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Chill\MainBundle\Doctrine\Migrations;
+
+use Doctrine\Migrations\Version\Comparator;
+use Doctrine\Migrations\Version\Version;
+
+use function strcmp;
+use function explode;
+
+/**
+ * Compare Version classes names from different namespaces and order them.
+ *
+ * Version are compared on the date's class.
+ */
+final class VersionComparator implements Comparator
+{
+    private function getNumber(Version $version): string
+    {
+        $names = explode("\\", (string) $version);
+
+        return end($names);
+    }
+
+    public function compare(Version $a, Version $b): int
+    {
+        $q = strcmp($this->getNumber($a), $this->getNumber($b));
+
+        return $q;
+    }
+}
+
diff --git a/config/services/doctrine.yaml b/config/services/doctrine.yaml
new file mode 100644
index 000000000..09b68f03b
--- /dev/null
+++ b/config/services/doctrine.yaml
@@ -0,0 +1,3 @@
+---
+services:
+  'Chill\MainBundle\Doctrine\Migrations\VersionComparator': ~
diff --git a/migrations/Version20141128194409.php b/migrations/Version20141128194409.php
index 6731826a4..2f75b9566 100644
--- a/migrations/Version20141128194409.php
+++ b/migrations/Version20141128194409.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20150821105642.php b/migrations/Version20150821105642.php
index 3880178b1..ffc3055ad 100644
--- a/migrations/Version20150821105642.php
+++ b/migrations/Version20150821105642.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20150821122935.php b/migrations/Version20150821122935.php
index 9e290c9df..f20b9d927 100644
--- a/migrations/Version20150821122935.php
+++ b/migrations/Version20150821122935.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20160310122322.php b/migrations/Version20160310122322.php
index 7e4b9d95f..25220555b 100644
--- a/migrations/Version20160310122322.php
+++ b/migrations/Version20160310122322.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20180703191509.php b/migrations/Version20180703191509.php
index 03f13a532..2546018c0 100644
--- a/migrations/Version20180703191509.php
+++ b/migrations/Version20180703191509.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20180709181423.php b/migrations/Version20180709181423.php
index 40b9f853f..3a23657f9 100644
--- a/migrations/Version20180709181423.php
+++ b/migrations/Version20180709181423.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
diff --git a/migrations/Version20180905101426.php b/migrations/Version20180905101426.php
index e8aafd57b..841a68750 100644
--- a/migrations/Version20180905101426.php
+++ b/migrations/Version20180905101426.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
diff --git a/migrations/Version20180911093642.php b/migrations/Version20180911093642.php
index c2fefa5f3..6ff24bc5a 100644
--- a/migrations/Version20180911093642.php
+++ b/migrations/Version20180911093642.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
diff --git a/migrations/Version20200422122715.php b/migrations/Version20200422122715.php
index 4f5b58105..3449e5f28 100644
--- a/migrations/Version20200422122715.php
+++ b/migrations/Version20200422122715.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Application\Migrations;
+namespace Chill\Migrations\Main;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;