diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index aaa806f1..597afbf1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug Report
 description: File a bug report
 labels: ['bug', 'triage']
+type: bug
 body:
   - type: dropdown
     id: read_troubleshooting
@@ -40,24 +41,6 @@ body:
     validations:
       required: true
 
-  - type: input
-    id: npm_yarn_version
-    attributes:
-      label: package manager and version
-      description: Tell us package manager you are using, and what version.
-      placeholder: npm 6.14.13
-    validations:
-      required: true
-
-  - type: input
-    id: operating_system
-    attributes:
-      label: Operating system
-      description: Tell us what operating system you use, and what version.
-      placeholder: macOS Big Sur, version 11.4
-    validations:
-      required: true
-
   - type: textarea
     id: bug_description
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/propose_new_rule.yml b/.github/ISSUE_TEMPLATE/propose_new_rule.yml
index 6af708cd..7c15b31c 100644
--- a/.github/ISSUE_TEMPLATE/propose_new_rule.yml
+++ b/.github/ISSUE_TEMPLATE/propose_new_rule.yml
@@ -1,6 +1,7 @@
 name: Propose a new rule
 description: Propose a new rule for the eslint-plugin-testing-library.
 labels: ['new rule', 'triage']
+type: feature
 body:
   - type: input
     id: name_for_new_rule
diff --git a/.github/ISSUE_TEMPLATE/request_general_change.yml b/.github/ISSUE_TEMPLATE/request_general_change.yml
index beebe0a6..b6d0e8fd 100644
--- a/.github/ISSUE_TEMPLATE/request_general_change.yml
+++ b/.github/ISSUE_TEMPLATE/request_general_change.yml
@@ -1,6 +1,7 @@
 name: Request a general change
 description: Request a general change for the eslint-plugin-testing-library.
 labels: ['enhancement', 'triage']
+type: task
 body:
   - type: input
     id: plugin_version
diff --git a/.github/ISSUE_TEMPLATE/request_rule_change.yml b/.github/ISSUE_TEMPLATE/request_rule_change.yml
index e3f8a27b..8a0d06ea 100644
--- a/.github/ISSUE_TEMPLATE/request_rule_change.yml
+++ b/.github/ISSUE_TEMPLATE/request_rule_change.yml
@@ -1,6 +1,7 @@
 name: Request a rule change
 description: Request a rule change for the eslint-plugin-testing-library.
 labels: ['enhancement', 'triage']
+type: feature
 body:
   - type: input
     id: what_rule_do_you_want_to_change