diff --git a/.github/ISSUE_TEMPLATE/1_BUG.md b/.github/ISSUE_TEMPLATE/1_BUG.md
index 53f5ac96676..2ee2d00bda0 100644
--- a/.github/ISSUE_TEMPLATE/1_BUG.md
+++ b/.github/ISSUE_TEMPLATE/1_BUG.md
@@ -1,11 +1,11 @@
 ---
-name: 🐞 Bug Report for PHPUnit 9 and PHPUnit 10
-about: Something is broken in PHPUnit 9 and in PHPUnit 10?
-labels: type/bug, version/9, version/10
+name: 🐞 Bug Report
+about: Something is broken?
+labels: type/bug
 ---
 
 <!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
+- Please do not report a bug for a version of PHPUnit that is no longer in Bugfix Support. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
 - Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
 - Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
 - Please do not report an issue if you are using a third-party extension such as alternative output printers.
diff --git a/.github/ISSUE_TEMPLATE/2_BUG_PHPUNIT_10.md b/.github/ISSUE_TEMPLATE/2_BUG_PHPUNIT_10.md
deleted file mode 100644
index 08913ce647b..00000000000
--- a/.github/ISSUE_TEMPLATE/2_BUG_PHPUNIT_10.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: 🐞 Bug Report for PHPUnit 10
-about: Something is broken in PHPUnit 10, but it works in PHPUnit 9?
-labels: type/bug, version/10
----
-
-<!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
-- Please do not report an issue if you are using a third-party extension such as alternative output printers.
-- Please do not report an issue for API changes in internal code (see https://phpunit.de/backward-compatibility.html#internal-code).
-- Please fill in this template according to your issue.
-- Please keep the table shown below at the top of your issue.
-- Please include the output of "composer info | sort" if you installed PHPUnit using Composer.
-- Please post code as text (using proper markup). Do not post screenshots of code.
-- Please remove this comment before submitting your issue.
--->
-
-| Q                   | A
-| --------------------| ---------------
-| PHPUnit version     | x.y.z
-| PHP version         | x.y.z
-| Installation Method | Composer / PHAR
-
-#### Summary
-
-<!-- Provide a summary describing the problem you are experiencing. -->
-
-#### Current behavior
-
-<!-- What is the current (buggy) behavior? -->
-
-#### How to reproduce
-
-<!-- Provide steps to reproduce the bug. -->
-
-#### Expected behavior
-
-<!-- What was the expected (correct) behavior? -->
diff --git a/.github/ISSUE_TEMPLATE/6_COMPATIBILITY_PHPUNIT_8.md b/.github/ISSUE_TEMPLATE/2_COMPATIBILITY.md
similarity index 77%
rename from .github/ISSUE_TEMPLATE/6_COMPATIBILITY_PHPUNIT_8.md
rename to .github/ISSUE_TEMPLATE/2_COMPATIBILITY.md
index 45127526085..f3573a1bc7a 100644
--- a/.github/ISSUE_TEMPLATE/6_COMPATIBILITY_PHPUNIT_8.md
+++ b/.github/ISSUE_TEMPLATE/2_COMPATIBILITY.md
@@ -1,11 +1,11 @@
 ---
-name: ⚠️ PHP Compatibility Issue in PHPUnit 8
-about: A change in a new version of PHP requires adaption in PHPUnit 8?
-labels: type/change-in-php-requires-adaptation, version/8
+name: ⚠️ PHP Compatibility Issue
+about: A change in PHP requires adaption in PHPUnit?
+labels: type/change-in-php-requires-adaptation
 ---
 
 <!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
+- Please do not report a bug for a version of PHPUnit that has reached its End-of-Life. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
 - Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
 - Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
 - Please do not report an issue if you are using a third-party extension such as alternative output printers.
diff --git a/.github/ISSUE_TEMPLATE/3_BUG_PHPUNIT_9.md b/.github/ISSUE_TEMPLATE/3_BUG_PHPUNIT_9.md
deleted file mode 100644
index 67584092e49..00000000000
--- a/.github/ISSUE_TEMPLATE/3_BUG_PHPUNIT_9.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: 🐞 Bug Report for PHPUnit 9
-about: Something is broken in PHPUnit 9, but it works in PHPUnit 10?
-labels: type/bug, version/9
----
-
-<!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
-- Please do not report an issue if you are using a third-party extension such as alternative output printers.
-- Please do not report an issue for API changes in internal code (see https://phpunit.de/backward-compatibility.html#internal-code).
-- Please fill in this template according to your issue.
-- Please keep the table shown below at the top of your issue.
-- Please include the output of "composer info | sort" if you installed PHPUnit using Composer.
-- Please post code as text (using proper markup). Do not post screenshots of code.
-- Please remove this comment before submitting your issue.
--->
-
-| Q                   | A
-| --------------------| ---------------
-| PHPUnit version     | x.y.z
-| PHP version         | x.y.z
-| Installation Method | Composer / PHAR
-
-#### Summary
-
-<!-- Provide a summary describing the problem you are experiencing. -->
-
-#### Current behavior
-
-<!-- What is the current (buggy) behavior? -->
-
-#### How to reproduce
-
-<!-- Provide steps to reproduce the bug. -->
-
-#### Expected behavior
-
-<!-- What was the expected (correct) behavior? -->
diff --git a/.github/ISSUE_TEMPLATE/7_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/7_FEATURE_REQUEST.md
rename to .github/ISSUE_TEMPLATE/3_FEATURE_REQUEST.md
diff --git a/.github/ISSUE_TEMPLATE/4_COMPATIBILITY_PHPUNIT_10.md b/.github/ISSUE_TEMPLATE/4_COMPATIBILITY_PHPUNIT_10.md
deleted file mode 100644
index 32830945e70..00000000000
--- a/.github/ISSUE_TEMPLATE/4_COMPATIBILITY_PHPUNIT_10.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: ⚠️ PHP Compatibility Issue in PHPUnit 10
-about: A change in a new version of PHP requires adaption in PHPUnit 10?
-labels: type/change-in-php-requires-adaptation, version/10
----
-
-<!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
-- Please do not report an issue if you are using a third-party extension such as alternative output printers.
-- Please fill in this template according to your issue.
-- Please keep the table shown below at the top of your issue.
-- Please include the output of "composer info | sort" if you installed PHPUnit using Composer.
-- Please post code as text (using proper markup). Do not post screenshots of code.
-- Please remove this comment before submitting your issue.
--->
-
-| Q                   | A
-| --------------------| ---------------
-| PHPUnit version     | x.y.z
-| PHP version         | x.y.z
-| Installation Method | Composer / PHAR
-
-#### Summary
-
-<!-- Provide a summary describing the problem you are experiencing. -->
-
-#### Current behavior
-
-<!-- What is the current behavior? -->
-
-#### How to reproduce
-
-<!-- Provide steps to reproduce the issue. -->
-
-#### Expected behavior
-
-<!-- What was the expected (correct) behavior? -->
diff --git a/.github/ISSUE_TEMPLATE/5_COMPATIBILITY_PHPUNIT_9.md b/.github/ISSUE_TEMPLATE/5_COMPATIBILITY_PHPUNIT_9.md
deleted file mode 100644
index 1def500976e..00000000000
--- a/.github/ISSUE_TEMPLATE/5_COMPATIBILITY_PHPUNIT_9.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: ⚠️ PHP Compatibility Issue in PHPUnit 9
-about: A change in a new version of PHP requires adaption in PHPUnit 9?
-labels: type/change-in-php-requires-adaptation, version/9
----
-
-<!--
-- Please do not report an issue for a version of PHPUnit that is no longer supported. A list of currently supported versions of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are using a version of PHP that is not supported by the version of PHPUnit you are using. A list that shows which version of PHP is supported by which version of PHPUnit is available at https://phpunit.de/supported-versions.html.
-- Please do not report an issue if you are not using PHPUnit directly, but rather a third-party wrapper around it.
-- Please do not report an issue if you are using a third-party extension such as alternative output printers.
-- Please fill in this template according to your issue.
-- Please keep the table shown below at the top of your issue.
-- Please include the output of "composer info | sort" if you installed PHPUnit using Composer.
-- Please post code as text (using proper markup). Do not post screenshots of code.
-- Please remove this comment before submitting your issue.
--->
-
-| Q                   | A
-| --------------------| ---------------
-| PHPUnit version     | x.y.z
-| PHP version         | x.y.z
-| Installation Method | Composer / PHAR
-
-#### Summary
-
-<!-- Provide a summary describing the problem you are experiencing. -->
-
-#### Current behavior
-
-<!-- What is the current behavior? -->
-
-#### How to reproduce
-
-<!-- Provide steps to reproduce the issue. -->
-
-#### Expected behavior
-
-<!-- What was the expected (correct) behavior? -->