diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
index 6b4db74bdb..b530963b6c 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
@@ -359,7 +359,7 @@ class Users implements ControllerProviderInterface
             $models = $app['repo.users']->findTemplateOwner($app['authentication']->getUser());
 
             $userRegistrations = [];
-            foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations(
+            foreach ($app['repo.registrations']->getUserRegistrations(
                  $app['authentication']->getUser(),
                  $app['acl']->get($app['authentication']->getUser())->get_granted_base(['canadmin'])
             ) as $registration) {
@@ -445,7 +445,7 @@ class Users implements ControllerProviderInterface
                         $app->abort(400, srpintf("User with id % in provided in 'deny' request variable could not be found", $usr));
                     }
                     $cacheToUpdate[$usr] = $user;
-                    foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations(
+                    foreach ($app['repo.registrations']->getUserRegistrations(
                         $user,
                         array_map(function ($baseId) use ($app) {
                             return \collection::get_from_base_id($app, $baseId);
@@ -461,7 +461,7 @@ class Users implements ControllerProviderInterface
                         $app->abort(400, srpintf("User with id % in provided in 'accept' request variable could not be found", $usr));
                     }
                     $cacheToUpdate[$usr] = $user;
-                    foreach ($app['manipulator.registration']->getRepository()->getUserRegistrations(
+                    foreach ($app['repo.registrations']->getUserRegistrations(
                         $user,
                         array_map(function ($baseId) use ($app) {
                             return \collection::get_from_base_id($app, $baseId);
diff --git a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
index 9e80571d1d..0472905218 100644
--- a/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
+++ b/lib/Alchemy/Phrasea/Controller/Client/Baskets.php
@@ -167,7 +167,7 @@ class Baskets implements ControllerProviderInterface
     public function getBaskets(Application $app, Request $request)
     {
         $selectedBasketId = trim($request->get('courChuId', ''));
-        $baskets = new ArrayCollection($app['EM']->getRepository('Phraseanet:Basket')->findActiveByUser($app['authentication']->getUser()));
+        $baskets = new ArrayCollection($app['repo.baskets']->findActiveByUser($app['authentication']->getUser()));
         $selectedBasket = null;
 
         if ('' === $selectedBasketId && $baskets->count() > 0) {
@@ -202,7 +202,7 @@ class Baskets implements ControllerProviderInterface
     public function checkBaskets(Application $app, Request $request)
     {
         $noview = 0;
-        $repository = $app['EM']->getRepository('Phraseanet:Basket');
+        $repository = $app['repo.baskets'];
 
         /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
         $baskets = $repository->findActiveByUser($app['authentication']->getUser());
diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php
index 67dd6f1032..f29a67958d 100644
--- a/lib/Alchemy/Phrasea/Controller/Lightbox.php
+++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php
@@ -76,7 +76,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $app['repo.baskets'];
 
             $basket_collection = array_merge(
                 $repository->findActiveByUser($app['authentication']->getUser())
@@ -209,7 +209,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $app['repo.baskets'];
 
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
                 $app['authentication']->getUser()
@@ -256,7 +256,7 @@ class Lightbox implements ControllerProviderInterface
                 return $app->redirectPath('logout');
             }
 
-            $repository = $app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $app['repo.baskets'];
 
             $basket_collection = $repository->findActiveValidationAndBasketByUser(
                 $app['authentication']->getUser()
diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
index e5d860122a..a814cb76f6 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
@@ -80,7 +80,7 @@ class WorkZone implements ControllerProviderInterface
     {
         $request = $app['request'];
 
-        $BasketRepo = $app['EM']->getRepository('Phraseanet:Basket');
+        $BasketRepo = $app['repo.baskets'];
 
         $Page = (int) $request->query->get('Page', 0);
 
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php
index 6a04fddafc..de847f99c7 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Login.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php
@@ -1032,7 +1032,7 @@ class Login implements ControllerProviderInterface
             if (!$user->isGuest() && $request->cookies->has('invite-usr_id')) {
                 if ($user->getId() != $inviteUsrId = $request->cookies->get('invite-usr_id')) {
 
-                    $repo = $app['EM']->getRepository('Phraseanet:Basket');
+                    $repo = $app['repo.baskets'];
                     $baskets = $repo->findBy(['usr_id' => $inviteUsrId]);
 
                     foreach ($baskets as $basket) {
diff --git a/lib/Alchemy/Phrasea/Controller/Root/Session.php b/lib/Alchemy/Phrasea/Controller/Root/Session.php
index bb697fd398..6d217ebc05 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/Session.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Session.php
@@ -102,7 +102,7 @@ class Session implements ControllerProviderInterface
             'notifications' => $app['events-manager']->get_notifications()
         ]);
 
-        $baskets = $app['EM']->getRepository('Phraseanet:Basket')->findUnreadActiveByUser($app['authentication']->getUser());
+        $baskets = $app['repo.baskets']->findUnreadActiveByUser($app['authentication']->getUser());
 
         foreach ($baskets as $basket) {
             $ret['changed'][] = $basket->getId();
diff --git a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
index 3ba68891b6..b281c19d14 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
@@ -190,6 +190,12 @@ class ORMServiceProvider implements ServiceProviderInterface
         $app['repo.tasks'] = $app->share(function (PhraseaApplication $app) {
             return $app['EM']->getRepository('Phraseanet:Task');
         });
+        $app['repo.registrations'] = $app->share(function (PhraseaApplication $app) {
+            return $app['EM']->getRepository('Phraseanet:Registration');
+        });
+        $app['repo.baskets'] = $app->share(function (PhraseaApplication $app) {
+            return $app['EM']->getRepository('Phraseanet:Basket');
+        });
     }
 
     public function boot(Application $app)
diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
index f3c9b173a3..09cd343052 100644
--- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
@@ -27,7 +27,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface
         });
 
         $app['registration.manager'] = $app->share(function (Application $app) {
-            return new RegistrationManager($app['phraseanet.appbox'], $app['manipulator.registration']->getRepository(), $app['locale']);
+            return new RegistrationManager($app['phraseanet.appbox'], $app['repo.registrations'], $app['locale']);
         });
 
         $app['registration.optional-fields'] = $app->share(function (Application $app) {
diff --git a/lib/Alchemy/Phrasea/Helper/WorkZone.php b/lib/Alchemy/Phrasea/Helper/WorkZone.php
index 03472e84fb..445f222a52 100644
--- a/lib/Alchemy/Phrasea/Helper/WorkZone.php
+++ b/lib/Alchemy/Phrasea/Helper/WorkZone.php
@@ -33,7 +33,7 @@ class WorkZone extends Helper
     public function getContent($sort)
     {
         /* @var $repo_baskets Alchemy\Phrasea\Model\Repositories\BasketRepository */
-        $repo_baskets = $this->app['EM']->getRepository('Phraseanet:Basket');
+        $repo_baskets = $this->app['repo.baskets'];
 
         $sort = in_array($sort, ['date', 'name']) ? $sort : 'name';
 
diff --git a/lib/classes/eventsmanager/notify/orderdeliver.php b/lib/classes/eventsmanager/notify/orderdeliver.php
index 95632f556d..be539d6004 100644
--- a/lib/classes/eventsmanager/notify/orderdeliver.php
+++ b/lib/classes/eventsmanager/notify/orderdeliver.php
@@ -98,7 +98,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
                 $receiver = Receiver::fromUser($user_to);
                 $emitter = Emitter::fromUser($user_from);
 
-                $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
+                $repository = $this->app['repo.baskets'];
                 $basket = $repository->find($params['ssel_id']);
 
                 $readyToSend = true;
@@ -151,7 +151,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
         $sender = $user->getDisplayName();
 
         try {
-            $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $this->app['repo.baskets'];
 
             $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
         } catch (\Exception $e) {
diff --git a/lib/classes/eventsmanager/notify/push.php b/lib/classes/eventsmanager/notify/push.php
index 540e0673fe..be88cf1f3e 100644
--- a/lib/classes/eventsmanager/notify/push.php
+++ b/lib/classes/eventsmanager/notify/push.php
@@ -80,7 +80,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
 
             $readyToSend = false;
             try {
-                $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
+                $repository = $this->app['repo.baskets'];
                 $basket = $repository->find($params['ssel_id']);
 
                 $user_from = $this->app['repo.users']->find($params['from']);
diff --git a/lib/classes/eventsmanager/notify/validationdone.php b/lib/classes/eventsmanager/notify/validationdone.php
index 07951beb5b..72cecf8a18 100644
--- a/lib/classes/eventsmanager/notify/validationdone.php
+++ b/lib/classes/eventsmanager/notify/validationdone.php
@@ -138,7 +138,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
         $sender = $registered_user->getDisplayName();
 
         try {
-            $repository = $this->app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $this->app['repo.baskets'];
 
             $basket = $repository->findUserBasket($ssel_id, $this->app['authentication']->getUser(), false);
         } catch (\Exception $e) {
diff --git a/lib/classes/set/export.php b/lib/classes/set/export.php
index 57c9badd11..429027862a 100644
--- a/lib/classes/set/export.php
+++ b/lib/classes/set/export.php
@@ -54,7 +54,7 @@ class set_export extends set_abstract
         }
 
         if ($sstid != "") {
-            $repository = $app['EM']->getRepository('Phraseanet:Basket');
+            $repository = $app['repo.baskets'];
 
             /* @var $repository Alchemy\Phrasea\Model\Repositories\BasketRepository */
             $Basket = $repository->findUserBasket($sstid, $app['authentication']->getUser(), false);