diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
new file mode 100644
index 00000000000..2e8db33a0c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -0,0 +1,39 @@
+name: Bug Report
+description: Tell us about something that isn't working as expected
+labels: [Bug]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Please enter a detailed description of your issue. If possible, please provide example code to reproduce the issue.
+    validations:
+      required: true
+  - type: input
+    id: node-js-version
+    attributes:
+      label: Node.js Version
+      description: Please enter your Node.js version `node --version`
+  - type: input
+    id: redis-server-version
+    attributes:
+      label: Redis Server Version
+      description: Please enter your Redis server version ([`INFO server`](https://redis.io/commands/info/))
+  - type: input
+    id: node-redis-version
+    attributes:
+      label: Node Redis Version
+      description: Please enter your node redis version `npm ls redis`
+  - type: input
+    id: platform
+    attributes:
+      label: Platform
+      description: Please enter the platform you are using e.g. Linux, macOS, Windows
+  - type: textarea
+    id: logs
+    attributes:
+      label: Logs
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: bash
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/DOCUMENTATION.yml b/.github/ISSUE_TEMPLATE/DOCUMENTATION.yml
new file mode 100644
index 00000000000..b5ece5aeca2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/DOCUMENTATION.yml
@@ -0,0 +1,11 @@
+name: Documentation
+description: Any questions or issues relating to the project documentation.
+labels: [Documentation]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Ask your question or describe your issue here.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
new file mode 100644
index 00000000000..ae10cbd7b7a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
@@ -0,0 +1,19 @@
+name: Feature Request
+description: Suggest an idea for this project
+labels: [Feature]
+body:
+  - type: textarea
+    id: motivation
+    attributes:
+      label: Motivation
+      description: How would Node Redis users benefit from this feature?
+    validations:
+      required: true
+  - type: textarea
+    id: basic-code-example
+    attributes:
+      label: Basic Code Example
+      description: Provide examples of how you imagine the API for this feature might be implemented. This will be automatically formatted into code, so no need for backticks.
+      render: JavaScript
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index a7fae8eeb11..00000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-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
deleted file mode 100644
index 0645d6e1a83..00000000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Bug
-assignees: ''
----