diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e459d1e55f..fb7b978bf4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,8 @@
 /src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
 # DependencyInjection
 /src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
+# ErrorRenderer
+/src/Symfony/Component/ErrorRenderer/* @yceruto
 # Form
 /src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
 /src/Symfony/Bridge/Twig/Form/* @xabbuh
@@ -33,6 +35,8 @@
 /src/Symfony/Bridge/Doctrine/PropertyInfo/* @dunglas
 # Serializer
 /src/Symfony/Component/Serializer/* @dunglas
+# TwigBundle
+/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
 # WebLink
 /src/Symfony/Component/WebLink/* @dunglas
 # Workflow
diff --git a/src/Symfony/Component/ErrorRenderer/composer.json b/src/Symfony/Component/ErrorRenderer/composer.json
index 31d15a79d9..804534aec6 100644
--- a/src/Symfony/Component/ErrorRenderer/composer.json
+++ b/src/Symfony/Component/ErrorRenderer/composer.json
@@ -10,6 +10,10 @@
             "name": "Fabien Potencier",
             "email": "fabien@symfony.com"
         },
+        {
+            "name": "Yonel Ceruto",
+            "email": "yonelceruto@gmail.com"
+        },
         {
             "name": "Symfony Community",
             "homepage": "https://symfony.com/contributors"