diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 14eb01cdf..7b6474265 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 82da0c388..3fc96860c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api