diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
similarity index 52%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/1_bug_report.md
index fb81416dd5e..0fc3e06cd2c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.md
@@ -1,10 +1,16 @@
+---
+name: 🐛 Bug Report
+about: Report errors and problems
+
+---
+
 <!--
 Thanks for submitting an issue!
 
-Here's a quick checklist for what to provide:
+Quick check-list while reporting bugs:
 -->
 
-- [ ] a detailed description of the bug or suggestion
+- [ ] a detailed description of the bug or problem you are having
 - [ ] output of `pip list` from the virtual environment you are using
 - [ ] pytest and operating system versions
 - [ ] minimal example if possible
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
new file mode 100644
index 00000000000..54912b05233
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_feature_request.md
@@ -0,0 +1,5 @@
+---
+name: 🚀 Feature Request
+about: Ideas for new features and improvements
+
+---
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..742d2e4d668
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ❓ Support Question
+    url: https://github.com/pytest-dev/pytest/discussions
+    about: Use GitHub's new Discussions feature for questions