diff --git a/packages/typo3-docs-theme/src/Twig/TwigExtension.php b/packages/typo3-docs-theme/src/Twig/TwigExtension.php
index 93e841fef..29bfd47fb 100644
--- a/packages/typo3-docs-theme/src/Twig/TwigExtension.php
+++ b/packages/typo3-docs-theme/src/Twig/TwigExtension.php
@@ -30,6 +30,7 @@
 use T3Docs\Typo3DocsTheme\Nodes\ViewHelperNode;
 use T3Docs\Typo3DocsTheme\Settings\Typo3DocsThemeSettings;
 use T3Docs\VersionHandling\DefaultInventories;
+use T3Docs\VersionHandling\Typo3VersionMapping;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
@@ -400,7 +401,20 @@ public function enrichForgeLink(string $reportButton, RenderContext $renderConte
             $description = $this->getIssueTitle($renderContext);
             $reportButton .= urlencode($description);
             $version = $this->typo3VersionService->getPreferredVersion();
-            $reportButton .= '&issue[custom_field_values][4]=' . $version;
+            switch ($version) {
+                case 'main':
+                    $reportButton .= '&issue[custom_field_values][4]=' . Typo3VersionMapping::getMajorVersionOfMain()->value;
+                    break;
+                case '13.4':
+                    $reportButton .= '&issue[custom_field_values][4]=13';
+                    break;
+                case '12.4':
+                    $reportButton .= '&issue[custom_field_values][4]=12';
+                    break;
+                case '11.5':
+                    $reportButton .= '&issue[custom_field_values][4]=11';
+                    break;
+            }
         }
         return $reportButton;
     }
diff --git a/packages/typo3-version-handling/src/Typo3VersionMapping.php b/packages/typo3-version-handling/src/Typo3VersionMapping.php
index 02925d473..4a7d59b56 100644
--- a/packages/typo3-version-handling/src/Typo3VersionMapping.php
+++ b/packages/typo3-version-handling/src/Typo3VersionMapping.php
@@ -45,4 +45,9 @@ public static function getAllVersions(): array
     {
         return array_map(static fn(Typo3VersionMapping $enumValue) => $enumValue->getVersion(), self::cases());
     }
+
+    public static function getMajorVersionOfMain(): Typo3VersionMapping
+    {
+        return Typo3VersionMapping::V13;
+    }
 }
diff --git a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
index ee83dec7f..b936a422c 100644
--- a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
+++ b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Breaking-87616-RemovedHookForAlteringPageLinks.html
@@ -134,7 +134,7 @@
         <li class="breadcrumb-item"><a href="Index.html">12.0 Changes</a></li>
                     <li aria-current="page"  class="breadcrumb-item  active">Breaking: #87616 - Removed hook for altering page links</li>
         </ol>
-        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FChangelog%2F12.0%2FBreaking-87616-RemovedHookForAlteringPageLinks.html&amp;issue[custom_field_values][4]=main" id="btnReportIssue" rel="nofollow noopener" target="_blank">
+        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FChangelog%2F12.0%2FBreaking-87616-RemovedHookForAlteringPageLinks.html&amp;issue[custom_field_values][4]=13" id="btnReportIssue" rel="nofollow noopener" target="_blank">
             <span class="btn-icon"><i class="fas fa-bug"></i></span>
             <span class="btn-text">Report issue</span>
         </a>
diff --git a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
index aa513e99f..248b8ba9f 100644
--- a/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
+++ b/tests/Integration/tests-full/changelog/expected/Changelog/12.0/Index.html
@@ -134,7 +134,7 @@
         <li class="breadcrumb-item"><a href="../../Changelog-12.html">ChangeLog v12</a></li>
                     <li aria-current="page"  class="breadcrumb-item  active">12.0 Changes</li>
         </ol>
-        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FChangelog%2F12.0%2FIndex.html&amp;issue[custom_field_values][4]=main" id="btnReportIssue" rel="nofollow noopener" target="_blank">
+        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FChangelog%2F12.0%2FIndex.html&amp;issue[custom_field_values][4]=13" id="btnReportIssue" rel="nofollow noopener" target="_blank">
             <span class="btn-icon"><i class="fas fa-bug"></i></span>
             <span class="btn-text">Report issue</span>
         </a>
diff --git a/tests/Integration/tests-full/changelog/expected/Index.html b/tests/Integration/tests-full/changelog/expected/Index.html
index 2efa5318b..a6dd751f3 100644
--- a/tests/Integration/tests-full/changelog/expected/Index.html
+++ b/tests/Integration/tests-full/changelog/expected/Index.html
@@ -130,7 +130,7 @@
 <ol class="breadcrumb">
                 <li aria-current="page"  class="breadcrumb-item  active">TYPO3 Core</li>
         </ol>
-        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FIndex.html&amp;issue[custom_field_values][4]=main" id="btnReportIssue" rel="nofollow noopener" target="_blank">
+        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FIndex.html&amp;issue[custom_field_values][4]=13" id="btnReportIssue" rel="nofollow noopener" target="_blank">
             <span class="btn-icon"><i class="fas fa-bug"></i></span>
             <span class="btn-text">Report issue</span>
         </a>
diff --git a/tests/Integration/tests-full/changelog/expected/Sitemap.html b/tests/Integration/tests-full/changelog/expected/Sitemap.html
index 138633b42..27a4e4ebe 100644
--- a/tests/Integration/tests-full/changelog/expected/Sitemap.html
+++ b/tests/Integration/tests-full/changelog/expected/Sitemap.html
@@ -132,7 +132,7 @@
     <li class="breadcrumb-item"><a href="Index.html">TYPO3 Core</a></li>
                     <li aria-current="page"  class="breadcrumb-item  active">Sitemap</li>
         </ol>
-        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FSitemap.html&amp;issue[custom_field_values][4]=main" id="btnReportIssue" rel="nofollow noopener" target="_blank">
+        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fextensions.typo3.org%2Fextension%2Fcore%2F%2FSitemap.html&amp;issue[custom_field_values][4]=13" id="btnReportIssue" rel="nofollow noopener" target="_blank">
             <span class="btn-icon"><i class="fas fa-bug"></i></span>
             <span class="btn-text">Report issue</span>
         </a>
diff --git a/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html b/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
index e9d9d8bfe..c8b9d0913 100644
--- a/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
+++ b/tests/Integration/tests-full/report-issue/report-issue-forge/expected/index.html
@@ -105,7 +105,7 @@
 <ol class="breadcrumb">
                 <li aria-current="page"  class="breadcrumb-item  active">Document Title</li>
         </ol>
-        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fdocs.typo3.org%2Fm%2Ftypo3%2Freference-coreapi%2F12.4%2Fen-us%2F%2Findex.html&amp;issue[custom_field_values][4]=12.4" id="btnReportIssue" rel="nofollow noopener" target="_blank">
+        <div class="breadcrumb-additions">        <a class="btn btn-sm btn-light" href="https://forge.typo3.org/projects/typo3cms-core/issues/new?issue[category_id]=1004&amp;issue[subject]=Problem+on+https%3A%2F%2Fdocs.typo3.org%2Fm%2Ftypo3%2Freference-coreapi%2F12.4%2Fen-us%2F%2Findex.html&amp;issue[custom_field_values][4]=12" id="btnReportIssue" rel="nofollow noopener" target="_blank">
             <span class="btn-icon"><i class="fas fa-bug"></i></span>
             <span class="btn-text">Report issue</span>
         </a>