diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 25d2098e..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS Version: [e.g. Windows 10 21H1 19043.1023]
- - App Version: [e.g. v1.0]
-
-**Additional comment**
-Add any other comment about the problem here. Does this problem happen again after restarting the app?
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..c402a7fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,49 @@
+name: Bug Report
+description: Report an issue to help us improve
+labels: [bug]
+body:
+    - type: textarea
+      attributes:
+          label: Description
+          description: A clear and concise description of what the bug is.
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Steps To Reproduce
+          description: Steps to reproduce the behavior.
+          placeholder: |
+              1. Go to '....'
+              2. Click on '....'
+              3. Scroll down to '....'
+              4. See the error
+      validations:
+          required: false
+    - type: textarea
+      attributes:
+          label: Expected behavior
+          description: A clear and concise description of what you expected to happen.
+      validations:
+          required: true
+    - type: input
+      id: app-version
+      attributes:
+          label: Xplorer Version
+          description: Which version of Xplorer are you using?
+          placeholder: v0.1.0
+      validations:
+          required: true
+    - type: input
+      attributes:
+          label: Operating System Version
+          description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
+          placeholder: e.g. Windows 10 21H1, macOS Catalina 10.15.7, or Ubuntu 20.04
+      validations:
+          required: true
+    - type: textarea
+      attributes:
+          label: Additional Information
+          description: |
+              A list of assets (e.g. screenshots) relevant to this bug.
+
+              Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..0113d6b3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
+contact_links:
+    - name: Feature Request
+      url: https://github.com/kimlimjustin/xplorer/discussions
+      about: Suggest an idea or solution for this project
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index a4421131..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem?**
-A clear description of what the problem is.
-
-**Describe the solution you'd like**
-A clear description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear description of any alternative solutions or features you've considered.
-
-**Additional comment**
-Add any other comment or screenshots about the feature request here.
\ No newline at end of file