diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2b339d1224..e9f2d000ba 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -30,17 +30,13 @@ body:
       label: Linux distro
       multiple: true
       options:
+        - Ubuntu 24.04
         - Ubuntu 22.04
         - Ubuntu 20.04
-        - Ubuntu 18.04
-        - Ubuntu 16.04
         - Debian 12
         - Debian 11
-        - Debian 10
-        - Debian 9
         - RedHat 9
         - RedHat 8
-        - RedHat 7
         - Other
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 45aced3d1f..f1a8ccaf6b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -30,17 +30,13 @@ body:
       label: Linux distro
       multiple: true
       options:
+        - Ubuntu 24.04
         - Ubuntu 22.04
         - Ubuntu 20.04
-        - Ubuntu 18.04
-        - Ubuntu 16.04
         - Debian 12
         - Debian 11
-        - Debian 10
-        - Debian 9
         - RedHat 9
         - RedHat 8
-        - RedHat 7
         - Other
     validations:
       required: false