diff --git a/src/Bundle/ChillMainBundle/config/services.yaml b/src/Bundle/ChillMainBundle/config/services.yaml
index fc8dbfd4f..3da8de581 100644
--- a/src/Bundle/ChillMainBundle/config/services.yaml
+++ b/src/Bundle/ChillMainBundle/config/services.yaml
@@ -61,22 +61,18 @@ services:
 
     chill.main.twig.translatable_string:
         class: Chill\MainBundle\Templating\TranslatableStringTwig
-        arguments:
-            - "@chill.main.helper.translatable_string"
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     chill.main.twig.widget:
         class: Chill\MainBundle\Templating\Widget\WidgetRenderingTwig
-        arguments:
-            - "@event_dispatcher"
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     chill.main.twig.csv_cell:
         class: Chill\MainBundle\Templating\CSVCellTwig
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     chill.main.validator.role_scope_scope_presence:
         class: Chill\MainBundle\Validation\Validator\RoleScopeScopePresence
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index 56bc1ff75..eeb20d161 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -28,12 +28,12 @@ services:
         arguments:
             $requestStack: '@Symfony\Component\HttpFoundation\RequestStack'
             $originalExtension: '@twig.extension.routing'
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension:
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     Chill\MainBundle\Templating\Entity\ChillEntityRenderManager:
         arguments:
@@ -47,8 +47,8 @@ services:
             - { name: 'chill.render_entity' }
 
     Chill\MainBundle\Templating\ChillMarkdownRenderExtension:
-        tags:
-            - { name: twig.extension }
+        autoconfigure: true
+        autowire: true
 
     Chill\MainBundle\Templating\Entity\AddressRender: ~
 
diff --git a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
index 644efe291..8a1b0c8a6 100644
--- a/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+++ b/src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
@@ -22,15 +22,9 @@ class CountNotificationTask implements NotificationCounterInterface
 {
     final public const string CACHE_KEY = 'chill_task.count_notifications.user.%d.%s';
 
-    /**
-     * @var CacheItempPoolInterface
-     */
-    protected $cachePool;
+    protected CacheItemPoolInterface $cachePool;
 
-    /**
-     * @var SingleTaskRepository
-     */
-    protected $singleTaskRepository;
+    protected SingleTaskRepository $singleTaskRepository;
 
     public function __construct(
         SingleTaskRepository $singleTaskRepository,
diff --git a/src/Bundle/ChillTaskBundle/config/services/templating.yaml b/src/Bundle/ChillTaskBundle/config/services/templating.yaml
index 0fb98cc19..d59add38d 100644
--- a/src/Bundle/ChillTaskBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillTaskBundle/config/services/templating.yaml
@@ -1,9 +1,7 @@
 services:
     Chill\TaskBundle\Templating\TaskTwigExtension:
-        arguments:
-            $taskWorkflowManager: '@Chill\TaskBundle\Workflow\TaskWorkflowManager'
-        tags:
-            - { name: 'twig.extension' }
+        autoconfigure: true
+        autowire: true
 
     Chill\TaskBundle\Templating\UI\CountNotificationTask:
         autoconfigure: true