diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
index e536767d..c8b1b08a 100644
--- a/.github/workflows/code_analysis.yaml
+++ b/.github/workflows/code_analysis.yaml
@@ -55,9 +55,4 @@ jobs:
             # composer install cache - https://github.com/ramsey/composer-install
             -   uses: "ramsey/composer-install@v3"
 
-            # Override code from symplify/coding-standard shipped with ECS
-            -   run: |
-                    rm -rf vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/src
-                    ln -s $PWD/src vendor/symplify/easy-coding-standard/vendor/symplify/coding-standard/
-
             -   run: ${{ matrix.actions.run }}
diff --git a/src/Fixer/Commenting/FixTagTypoFixer.php b/src/Fixer/Commenting/FixTagTypoFixer.php
new file mode 100644
index 00000000..e1c04cb8
--- /dev/null
+++ b/src/Fixer/Commenting/FixTagTypoFixer.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symplify\CodingStandard\Fixer\Commenting;
+
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+use Symplify\CodingStandard\Utils\Regex;
+
+/**
+ * Fixes a plural typo in a doc block tag, e.g. "@returns" → "@return", "@params" → "@param", "@vars" → "@var".
+ *
+ * @see \Symplify\CodingStandard\Tests\Fixer\Commenting\FixTagTypoFixer\FixTagTypoFixerTest
+ */
+final class FixTagTypoFixer extends AbstractDocBlockFixer
+{
+    /**
+     * @see https://regex101.com/r/8tFqJp/1
+     */
+    private const string PLURAL_TAG_REGEX = '#@((?:psalm-|phpstan-)?(?:param|return|var))s\b#';
+
+    public function getDefinition(): FixerDefinitionInterface
+    {
+        return new FixerDefinition('Fix a plural typo in a doc block tag, e.g. "@returns" to "@return"', []);
+    }
+
+    /**
+     * @param Tokens<Token> $tokens
+     */
+    protected function processDocContent(string $docContent, Tokens $tokens, int $position): string
+    {
+        return Regex::replace($docContent, self::PLURAL_TAG_REGEX, '@$1');
+    }
+}
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/FixTagTypoFixerTest.php b/tests/Fixer/Commenting/FixTagTypoFixer/FixTagTypoFixerTest.php
new file mode 100644
index 00000000..c7729266
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/FixTagTypoFixerTest.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symplify\CodingStandard\Tests\Fixer\Commenting\FixTagTypoFixer;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractCheckerTestCase;
+
+final class FixTagTypoFixerTest extends AbstractCheckerTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFiles(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfig(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/plural_tags.php.inc b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/plural_tags.php.inc
new file mode 100644
index 00000000..e056b305
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/plural_tags.php.inc
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @params string $one
+ * @params string $two
+ * @returns string
+ */
+function someFunction(string $one, string $two)
+{
+}
+
+?>
+-----
+<?php
+
+/**
+ * @param string $one
+ * @param string $two
+ * @return string
+ */
+function someFunction(string $one, string $two)
+{
+}
+
+?>
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_correct_tags.php.inc b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_correct_tags.php.inc
new file mode 100644
index 00000000..fb7e4000
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_correct_tags.php.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @param string $one
+ * @param string $two
+ * @return string
+ */
+function correctFunction(string $one, string $two)
+{
+}
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_other_tags.php.inc b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_other_tags.php.inc
new file mode 100644
index 00000000..79d488e4
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_other_tags.php.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * @throws \RuntimeException
+ * @property-read int $id
+ * @method string getName()
+ */
+class SomeEntity
+{
+}
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_word_in_text.php.inc b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_word_in_text.php.inc
new file mode 100644
index 00000000..7e16ba72
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/skip_word_in_text.php.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * This method returns a value and accepts params from the caller.
+ *
+ * @param string $name
+ */
+function describedFunction(string $name)
+{
+}
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/var_tag.php.inc b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/var_tag.php.inc
new file mode 100644
index 00000000..7c65eaaf
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/Fixture/var_tag.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+class SomeClass
+{
+    /**
+     * @vars int
+     */
+    private $count;
+}
+
+?>
+-----
+<?php
+
+class SomeClass
+{
+    /**
+     * @var int
+     */
+    private $count;
+}
+
+?>
diff --git a/tests/Fixer/Commenting/FixTagTypoFixer/config/configured_rule.php b/tests/Fixer/Commenting/FixTagTypoFixer/config/configured_rule.php
new file mode 100644
index 00000000..5f07c1ff
--- /dev/null
+++ b/tests/Fixer/Commenting/FixTagTypoFixer/config/configured_rule.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use Symplify\CodingStandard\Fixer\Commenting\FixTagTypoFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return static function (ECSConfig $ecsConfig): void {
+    $ecsConfig->rule(FixTagTypoFixer::class);
+};