diff --git a/.github/ISSUE_TEMPLATE/blank_issue.md b/.github/ISSUE_TEMPLATE/blank_issue.md
deleted file mode 100644
index 3a72c534f..000000000
--- a/.github/ISSUE_TEMPLATE/blank_issue.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-name: 📝 Create an Issue
-about: Create a blank issue.
----
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 000000000..175ed7108
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,65 @@
+name: Bug Report
+description: File a bug report to help us improve
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: software
+    attributes:
+      label: Software
+      description: What software are you referring to?
+      multiple: true
+      options:
+        - Desktop Application
+        - Pieces OS
+        - Web Extension
+        - VS Code
+        - JetBrains
+        - Obsidian
+        - Visual Studio
+        - JupyterLab
+        - Microsoft Teams
+        - Sharing Web App
+        - Marketing Site (pieces.app)
+        - Blog (code.pieces.app/blog)
+        - Release Notes (code.pieces.app/updates)
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System / Platform
+      description: What operating system / platform are you using?
+      options:
+        - macOS
+        - Windows
+        - Linux
+        - Web
+      default: 0
+    validations:
+      required: true
+  - type: input
+    id: pieces-os-version
+    attributes:
+      label: Your Pieces OS Version
+      description: Add the version of Pieces OS installed in your system
+    validations:
+      required: true
+  - type: checkboxes
+    id: early_access_program
+    attributes:
+      label: Early Access Program
+      description: Is this issue related to a feature in our Early Access Program?
+      options:
+        - label: Yes, this is related to an Early Access Program feature.
+  - type: textarea
+    id: description
+    attributes:
+      label: Kindly describe the bug and include as much detail as possible on what you were doing so we can reproduce the bug.
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 89a46f571..000000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Feature or Enhancement Request
-    url: https://github.com/pieces-app/support/discussions
-    about: Post your idea in discussions for the Pieces team and community to discuss!
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..6532412f5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file