diff --git a/libraries/classes/Command/FixPoTwigCommand.php b/libraries/classes/Command/FixPoTwigCommand.php
new file mode 100644
index 0000000000..d0cb221beb
--- /dev/null
+++ b/libraries/classes/Command/FixPoTwigCommand.php
@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+use function fclose;
+use function file_get_contents;
+use function fopen;
+use function fwrite;
+use function intval;
+use function is_array;
+use function json_decode;
+use function preg_replace_callback;
+
+use const ROOT_PATH;
+
+final class FixPoTwigCommand extends Command
+{
+    /** @var string|null */
+    protected static $defaultName = 'fix-po-twig';
+
+    private const POT_FILE = ROOT_PATH . 'po/phpmyadmin.pot';
+    private const REPLACE_FILE = ROOT_PATH . 'twig-templates/replace.json';
+
+    protected function configure(): void
+    {
+        $this->setDescription('Fixes POT file for Twig templates');
+        $this->setHelp(
+            'The <info>%command.name%</info> command fixes the Twig file name and line number in the'
+            . ' POT file to match the Twig template and not the compiled Twig file.'
+        );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $replaceFile = file_get_contents(self::REPLACE_FILE);
+        if ($replaceFile === false) {
+            return Command::FAILURE;
+        }
+
+        $replacements = json_decode($replaceFile, true);
+        if (! is_array($replacements)) {
+            return Command::FAILURE;
+        }
+
+        /* Read pot file */
+        $pot = file_get_contents(self::POT_FILE);
+        if ($pot === false) {
+            return Command::FAILURE;
+        }
+
+        /* Do the replacements */
+        $pot = preg_replace_callback(
+            '@(twig-templates[0-9a-f/]*.php):([0-9]*)@',
+            static function (array $matches) use ($replacements): string {
+                $filename = $matches[1];
+                $line = intval($matches[2]);
+                $replace = $replacements[$filename];
+                foreach ($replace[1] as $cacheLine => $result) {
+                    if ($line >= $cacheLine) {
+                        return $replace[0] . ':' . $result;
+                    }
+                }
+
+                return $replace[0] . ':0';
+            },
+            $pot
+        );
+        if ($pot === null) {
+            return Command::FAILURE;
+        }
+
+        /* Write fixed file */
+        $handle = fopen(self::POT_FILE, 'w');
+        if ($handle === false) {
+            return Command::FAILURE;
+        }
+
+        if (fwrite($handle, $pot) === false) {
+            return Command::FAILURE;
+        }
+
+        if (! fclose($handle)) {
+            return Command::FAILURE;
+        }
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/scripts/console b/scripts/console
index 1893d86eac..52b05044b0 100755
--- a/scripts/console
+++ b/scripts/console
@@ -2,6 +2,7 @@
 <?php
 
 use PhpMyAdmin\Command\CacheWarmupCommand;
+use PhpMyAdmin\Command\FixPoTwigCommand;
 use PhpMyAdmin\Command\SetVersionCommand;
 use PhpMyAdmin\Command\WriteGitRevisionCommand;
 use PhpMyAdmin\Command\TwigLintCommand;
@@ -37,5 +38,6 @@ $application->add(new CacheWarmupCommand());
 $application->add(new TwigLintCommand());
 $application->add(new SetVersionCommand());
 $application->add(new WriteGitRevisionCommand());
+$application->add(new FixPoTwigCommand());
 
 $application->run();
diff --git a/scripts/fix-po-twig b/scripts/fix-po-twig
deleted file mode 100644
index 9c3d86770d..0000000000
--- a/scripts/fix-po-twig
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-declare(strict_types=1);
-
-if (! defined('ROOT_PATH')) {
-    define('ROOT_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR);
-}
-
-$tmpDir = dirname(__FILE__) . '/../twig-templates';
-$potName = 'po/phpmyadmin.pot';
-$replacements = json_decode(file_get_contents($tmpDir . '/replace.json'), true);
-
-/* Read pot file */
-$pot = file_get_contents($potName);
-
-/* Do the replacements */
-$pot = preg_replace_callback(
-    '@(twig-templates[0-9a-f/]*.php):([0-9]*)@',
-    function ($matches) {
-        global $replacements;
-        $filename = $matches[1];
-        $line = intval($matches[2]);
-        $replace = $replacements[$filename];
-        foreach ($replace[1] as $cacheline => $result) {
-            if ($line >= $cacheline) {
-                return $replace[0] . ':' . $result;
-            }
-        }
-        return $replace[0] . ':0';
-    },
-    $pot
-);
-
-/* Write fixed file */
-$handle = fopen($potName, 'w');
-fwrite($handle, $pot);
-fclose($handle);
diff --git a/scripts/update-po b/scripts/update-po
index b8432eed51..4c42eeafd0 100755
--- a/scripts/update-po
+++ b/scripts/update-po
@@ -38,7 +38,7 @@ xgettext \
     `cat ./twig-templates/filesList`
 
 # Fixup filenames for Twig templates
-php scripts/fix-po-twig
+php scripts/console fix-po-twig
 
 # Remote twig templates
 rm -rf twig-templates/