diff --git a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
index 80cc0325b..e78d9c89b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
+++ b/src/Bundle/ChillCustomFieldsBundle/config/services.yaml
@@ -35,12 +35,12 @@ services:
         tags:
             - { name: 'form.type', alias: 'custom_field' }
 
-    chill.custom_field.text:
-        class: Chill\CustomFieldsBundle\CustomFields\CustomFieldText
+    Chill\CustomFieldsBundle\CustomFields\CustomFieldText:
         autowire: true
         autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'text' }
+    chill.custom_field.text: '@Chill\CustomFieldsBundle\CustomFields\CustomFieldText'
 
     chill.custom_field.number:
         class: Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber
@@ -59,12 +59,12 @@ services:
         tags:
             - { name: form.type_extension, extended_type: Symfony\Component\Form\Extension\Core\Type\NumberType }
 
-    chill.custom_field.choice:
-        class: Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice
+    Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice:
         autowire: true
         autoconfigure: true
         tags:
             - { name: 'chill.custom_field', type: 'choice' }
+    chill.custom_field.choice: '@Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice'
 
     chill.custom_field.custom_fields_group_linked_custom_fields:
         class: Chill\CustomFieldsBundle\Form\Type\LinkedCustomFieldsType
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
index b1c66cd3f..b9eaf58ec 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
@@ -353,7 +353,7 @@ class LoadPostalCodes extends AbstractFixture implements OrderedFixtureInterface
                 ->setCode($code[0])
                 ->setName(ucwords(strtolower($code[1])));
 
-            if (null !== $code[3]) {
+            if (null !== ($code[3] ?? null)) {
                 $c->setRefPostalCodeId($code[3]);
             }
 
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
index 24514c70a..6981269cc 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadCustomFields.php
@@ -30,29 +30,21 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 
 class LoadCustomFields extends AbstractFixture implements
-    ContainerAwareInterface,
     OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+    private $cfText;
+
+    private $cfChoice;
 
     /**
-     * @var CustomField
-     */
-    private $customFieldChoice;
-
-    /**
-     * @var CustomField
-     */
-    private $customFieldText;
-
     /**
      * LoadCustomFields constructor.
      */
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper)
-    {
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+        private readonly CustomFieldChoice $customFieldChoice,
+        private readonly CustomFieldText $customFieldText,
+    ) {
     }
 
     //put your code here
@@ -68,41 +60,26 @@ class LoadCustomFields extends AbstractFixture implements
         $manager->flush();
     }
 
-    public function setContainer(?ContainerInterface $container = null)
-    {
-        if (null === $container) {
-            throw new RuntimeException('The given container should not be null');
-        }
-
-        $this->container = $container;
-    }
-
     private function createCustomFieldChoice()
     {
-        return new CustomFieldChoice(
-            $this->container->get(Environment::class),
-            $this->translatableStringHelper
-        );
+        return $this->customFieldChoice;
     }
 
     private function createCustomFieldText()
     {
-        return new CustomFieldText(
-            $this->container->get(Environment::class),
-            $this->translatableStringHelper
-        );
+        return $this->customFieldText;
     }
 
     private function loadData(ObjectManager $manager)
     {
-        $personIds = $this->container->get(EntityManagerInterface::class)
+        $personIds = $this->entityManager
             ->createQuery('SELECT person.id FROM ChillPersonBundle:Person person')
             ->getScalarResult();
 
         // get possible values for cfGroup
         $choices = array_map(
             static fn ($a) => $a['slug'],
-            $this->customFieldChoice->getOptions()['choices']
+            $this->cfChoice->getOptions()['choices']
         );
         // create faker
         $faker = \Faker\Factory::create('fr_FR');
@@ -114,9 +91,9 @@ class LoadCustomFields extends AbstractFixture implements
                 $person = $manager->getRepository(Person::class)->find($id);
                 $person->setCFData([
                     'remarques' => $this->createCustomFieldText()
-                        ->serialize($faker->text(random_int(150, 250)), $this->customFieldText),
+                        ->serialize($faker->text(random_int(150, 250)), $this->cfText),
                     'document-d-identite' => $this->createCustomFieldChoice()
-                        ->serialize([$choices[array_rand($choices)]], $this->customFieldChoice),
+                        ->serialize([$choices[array_rand($choices)]], $this->cfChoice),
                 ]);
             }
         }
@@ -148,7 +125,7 @@ class LoadCustomFields extends AbstractFixture implements
         $manager->persist($customField0);
 
         // create text field
-        $this->customFieldText = (new CustomField())
+        $this->cfText = $customFieldText = (new CustomField())
             ->setActive(true)
             ->setName(['fr' => 'Remarques'])
             ->setSlug('remarques')
@@ -156,10 +133,10 @@ class LoadCustomFields extends AbstractFixture implements
             ->setType('text')
             ->setOptions(['maxLength' => 5000])
             ->setCustomFieldsGroup($cfGroup);
-        $manager->persist($this->customFieldText);
+        $manager->persist($customFieldText);
 
         // create choice field
-        $this->customFieldChoice = (new CustomField())
+        $this->cfChoice = $customFieldChoice = (new CustomField())
             ->setActive(true)
             ->setName(['fr' => "Document d'identité"])
             ->setSlug('document-d-identite')
@@ -190,6 +167,6 @@ class LoadCustomFields extends AbstractFixture implements
                     ],
                 ],
             ]);
-        $manager->persist($this->customFieldChoice);
+        $manager->persist($customFieldChoice);
     }
 }