diff --git a/code-quality/ecs.php b/code-quality/ecs.php
index bd07219..d2335aa 100644
--- a/code-quality/ecs.php
+++ b/code-quality/ecs.php
@@ -4,6 +4,7 @@
 
 use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
 use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
+use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
 use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
 use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
 use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
@@ -11,6 +12,7 @@
 use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Option;
+use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return ECSConfig::configure()
     ->withPaths([
@@ -18,13 +20,12 @@
         __DIR__ . '/../Tests',
         __DIR__ . '/ecs.php',
     ])
-    ->withPreparedSets(
-        psr12: true,
-        common: true,
-        cleanCode: true,
-        symplify: true
-    )
-    ->withPhpCsFixerSets(psr12: true)
+    ->withSets([
+        SetList::PSR_12,
+        SetList::COMMON,
+        SetList::SYMPLIFY,
+        SetList::CLEAN_CODE,
+    ])
     ->withConfiguredRule(
         LineLengthFixer::class,
         [
@@ -43,5 +44,6 @@
             __DIR__ . '/../Classes/TYPO3/Configuration/ExtensionConfiguration.php',
         ],
         DeclareStrictTypesFixer::class => null,
+        GeneralPhpdocAnnotationRemoveFixer::class => null,
     ])
     ->withSpacing(OPTION::INDENTATION_SPACES, "\n");