diff --git a/src/Repository/OrderItemRepository.php b/src/Repository/OrderItemRepository.php
index 1a67eb5c..40c22e43 100644
--- a/src/Repository/OrderItemRepository.php
+++ b/src/Repository/OrderItemRepository.php
@@ -29,7 +29,10 @@ public function countByVariant(ProductVariantInterface $variant, array $orderSta
             $orderStates = [OrderInterface::STATE_CANCELLED, OrderInterface::STATE_CART];
         }
 
-        return (int) ($this->baseOrderItemRepository
+        /** @var EntityRepository $baseOrderItemRepository */
+        $baseOrderItemRepository = $this->baseOrderItemRepository;
+
+        return (int) ($baseOrderItemRepository
             ->createQueryBuilder('oi')
             ->select('SUM(oi.quantity)')
             ->join('oi.order', 'o')
diff --git a/src/Repository/ProductAttributeRepository.php b/src/Repository/ProductAttributeRepository.php
index b01fe6ad..2255c193 100644
--- a/src/Repository/ProductAttributeRepository.php
+++ b/src/Repository/ProductAttributeRepository.php
@@ -12,7 +12,6 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\Repository;
 
-use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
@@ -25,11 +24,10 @@ public function __construct(
 
     public function getAttributeTypeByName(string $attributeName): string
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->productAttributeRepository;
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->productAttributeRepository->createQueryBuilder('p');
 
         $result = $queryBuilder
-            ->createQueryBuilder('o')
             ->select('p.type')
             ->where('p.code = :code')
             ->setParameter(':code', $attributeName)
@@ -41,14 +39,12 @@ public function getAttributeTypeByName(string $attributeName): string
 
     public function findAllWithTranslations(?string $locale): array
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->productAttributeRepository;
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->productAttributeRepository->createQueryBuilder('o');
 
         if (null !== $locale) {
             $queryBuilder
-                ->createQueryBuilder('o')
                 ->addSelect('translation')
-                /** @phpstan-ignore-next-line */
                 ->leftJoin('o.translations', 'translation', 'ot')
                 ->andWhere('translation.locale = :locale')
                 ->setParameter('locale', $locale)
@@ -56,7 +52,6 @@ public function findAllWithTranslations(?string $locale): array
         }
 
         return $queryBuilder
-            ->createQueryBuilder('o')
             ->getQuery()
             ->getResult()
         ;