diff --git a/app/config/packages/doctrine.yaml b/app/config/packages/doctrine.yaml
index 757d04787..cbf1c485a 100644
--- a/app/config/packages/doctrine.yaml
+++ b/app/config/packages/doctrine.yaml
@@ -24,7 +24,11 @@ doctrine:
         is_bundle: false
         dir: '%kernel.project_dir%/../sources/AppBundle/Accounting/Entity'
         prefix: 'AppBundle\Accounting\Entity'
-        alias: Accounting
+      Site:
+        type: attribute
+        is_bundle: false
+        dir: '%kernel.project_dir%/../sources/AppBundle/Site/Entity'
+        prefix: 'AppBundle\Site\Entity'
 
 when@test:
   doctrine:
diff --git a/sources/Afup/Utils/Pays.php b/sources/Afup/Utils/Pays.php
index 6031b1fbd..6f8fdad2c 100644
--- a/sources/Afup/Utils/Pays.php
+++ b/sources/Afup/Utils/Pays.php
@@ -4,7 +4,7 @@
 
 namespace Afup\Site\Utils;
 
-use AppBundle\Site\Model\Repository\CountryRepository;
+use AppBundle\Site\Entity\Repository\CountryRepository;
 
 /**
  * Classe de gestion des pays
@@ -20,11 +20,11 @@ public function __construct(private readonly CountryRepository $countryRepositor
      *
      * @return array<string, string>
      */
-    public function obtenirPays()
+    public function obtenirPays(): array
     {
         $result = [];
-        foreach ($this->countryRepository->getAllCountries() as $country) {
-            $result[$country->getId()] = $country->getName();
+        foreach ($this->countryRepository->getAllSortedByName() as $country) {
+            $result[$country->id] = $country->name;
         }
 
         return $result;
@@ -35,6 +35,6 @@ public function obtenirPays()
      */
     public function obtenirNom(string $id): string
     {
-        return $this->countryRepository->getOneBy(['id' => $id])->getName();
+        return $this->countryRepository->find($id)->name;
     }
 }
diff --git a/sources/AppBundle/Site/Entity/Country.php b/sources/AppBundle/Site/Entity/Country.php
new file mode 100644
index 000000000..3fab706dd
--- /dev/null
+++ b/sources/AppBundle/Site/Entity/Country.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Site\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'afup_pays')]
+class Country
+{
+    #[ORM\Id]
+    #[ORM\Column(length: 255, nullable: false)]
+    public string $id;
+
+    #[ORM\Column(name: 'nom', length: 2, nullable: false)]
+    public string $name;
+}
diff --git a/sources/AppBundle/Site/Entity/Repository/CountryRepository.php b/sources/AppBundle/Site/Entity/Repository/CountryRepository.php
new file mode 100644
index 000000000..521b60b41
--- /dev/null
+++ b/sources/AppBundle/Site/Entity/Repository/CountryRepository.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace AppBundle\Site\Entity\Repository;
+
+use AppBundle\Doctrine\EntityRepository;
+use AppBundle\Site\Entity\Country;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends EntityRepository<Country>
+ */
+final class CountryRepository extends EntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Country::class);
+    }
+
+    /**
+     * @return array<Country>
+     */
+    public function getAllSortedByName(): array
+    {
+        return $this->createQueryBuilder('c')
+            ->orderBy('c.name', 'asc')
+            ->getQuery()
+            ->execute();
+    }
+}
diff --git a/sources/AppBundle/Site/Model/Country.php b/sources/AppBundle/Site/Model/Country.php
deleted file mode 100644
index 9c02301d5..000000000
--- a/sources/AppBundle/Site/Model/Country.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace AppBundle\Site\Model;
-
-use CCMBenchmark\Ting\Entity\NotifyProperty;
-use CCMBenchmark\Ting\Entity\NotifyPropertyInterface;
-
-class Country implements NotifyPropertyInterface
-{
-    use NotifyProperty;
-
-    private string $id = '';
-
-    private string $name = '';
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function setId(string $id): self
-    {
-        $this->propertyChanged('id', $this->id, $id);
-        $this->id = $id;
-
-        return $this;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function setName(string $name): self
-    {
-        $this->propertyChanged('name', $this->name, $name);
-        $this->name = $name;
-
-        return $this;
-    }
-}
diff --git a/sources/AppBundle/Site/Model/Repository/CountryRepository.php b/sources/AppBundle/Site/Model/Repository/CountryRepository.php
deleted file mode 100644
index 2e8f1d75d..000000000
--- a/sources/AppBundle/Site/Model/Repository/CountryRepository.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace AppBundle\Site\Model\Repository;
-
-use AppBundle\Site\Model\Country;
-use Aura\SqlQuery\Common\SelectInterface;
-use CCMBenchmark\Ting\Repository\CollectionInterface;
-use CCMBenchmark\Ting\Repository\HydratorSingleObject;
-use CCMBenchmark\Ting\Repository\Metadata;
-use CCMBenchmark\Ting\Repository\MetadataInitializer;
-use CCMBenchmark\Ting\Repository\Repository;
-use CCMBenchmark\Ting\Serializer\SerializerFactoryInterface;
-
-/**
- * @extends Repository<Country>
- */
-class CountryRepository extends Repository implements MetadataInitializer
-{
-    /**
-     * @return CollectionInterface<Country>
-     */
-    public function getAllCountries(): CollectionInterface
-    {
-        /** @var SelectInterface $builder */
-        $builder = $this->getQueryBuilder(self::QUERY_SELECT);
-        $builder->cols(['*'])
-            ->from('afup_pays')
-            ->orderBy(['nom asc']);
-
-        return $this->getQuery($builder->getStatement())->query($this->getCollection(new HydratorSingleObject()));
-    }
-
-
-    /**
-     * @inheritDoc
-     */
-    public static function initMetadata(SerializerFactoryInterface $serializerFactory, array $options = []): Metadata
-    {
-        $metadata = new Metadata($serializerFactory);
-        $metadata->setEntity(Country::class);
-        $metadata->setConnectionName('main');
-        $metadata->setDatabase($options['database']);
-        $metadata->setTable('afup_pays');
-        $metadata
-            ->addField([
-                'columnName' => 'id',
-                'fieldName' => 'id',
-                'primary' => true,
-                'type' => 'string',
-            ])
-            ->addField([
-                'columnName' => 'nom',
-                'fieldName' => 'name',
-                'type' => 'string',
-            ]);
-
-        return $metadata;
-    }
-}