diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 9b181d4314..0000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: ⚠️ Bug report
-labels: needs-triage
----
-
-### Issue
-
-> Describe your issue here
-
----
-
-### Environment
-
-<!-- e.g. "node --version" -->
- - **Node.js Version**: `VERSION_HERE`
-
-<!-- e.g. "redis-server --version" -->
- - **Redis Server Version**: `VERSION_HERE`
-
-<!-- e.g. Windows 10, Mac OSX 10.15.2 -->
- - **Platform**: `PLATFORM_HERE`
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000000..a7fae8eeb1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,15 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+---
+
+<!-- Describe your issue here -->
+
+**Environment:**
+ - **Node.js Version**: <!-- e.g. "node --version" -->
+ - **Redis Server Version**: <!-- e.g. "redis-server --version" -->
+ - **Node Redis Version**: <!-- e.g. "npm ls redis" -->
+ - **Platform**: <!-- e.g. Ubuntu 20.04.3, Windows 10, Mac OS 11.6 -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000000..0645d6e1a8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Bug
+assignees: ''
+---