diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
deleted file mode 100644
index 3805dd2b..00000000
--- a/.github/ISSUE_TEMPLATE/Bug_Report.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-name: "Bug report 🐛"
-about: Report errors or unexpected behavior
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- 
-🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
-
-I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
-1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
-2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
-3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
-4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
-5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
-
-All good? Then proceed!
--->
-
-<!--
-This bug tracker is monitored by Windows Package Manager development team and other technical folks.
-
-**Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
-Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
-
-If this is an application crash, please also provide a Feedback Hub submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Package Manager Create" and choose "Share My Feedback" after submission to get the link.
-
-Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
-
--->
-
-# Brief description of your issue
-<!--
-Please use this section to describe your issue.   This could be a repeat of the title, or maybe you have more to say.
--->
-# Steps to reproduce
-
-<!-- A description of how to trigger this bug. -->
-
-# Expected behavior
-
-<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->
-
-# Actual behavior
-
-<!-- What's actually happening? -->
-
-
-# Environment
-
-<!-- A description of the environment that this tool is running in. -->
-```none
-Windows Package Manager Manifest Creator version? (wingetcreate.exe -?)
-
-Any other software?
-```
\ 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..5ef56d8d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.yml
@@ -0,0 +1,53 @@
+name: "Bug report 🐛"
+description: Report errors or unexpected behavior
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > This bug tracker is monitored by Windows Package Manager development team and other technical folks.
+        > 
+        > **Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
+        > Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
+        >
+        > If this is an application crash, please also provide a Feedback Hub submission link if at all possible so we can find your diagnostic data on the backend.
+        > You can open the Feedback Hub directly to the pre-populated form at https://aka.ms/winget-feedback
+        > Alternatively, use the category "Apps > Windows Package Manager" and choose "Share My Feedback" after submission to get the link.
+        >
+        > Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
+  - type: textarea
+    attributes:
+      label: Brief description of your issue
+      placeholder: Briefly describe your issue here.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      placeholder: A description of how to trigger this bug
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      placeholder: What did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behavior
+      placeholder: What is currently happening?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      placeholder: |
+        [winget --info]
+        Windows Package Manager version
+        Windows: Windows.Desktop version
+        Package: Microsoft.DesktopAppInstaller version
+
+        Any other software?
+      render: shell
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/Documentation_Issue.md b/.github/ISSUE_TEMPLATE/Documentation_Issue.md
deleted file mode 100644
index 808bf813..00000000
--- a/.github/ISSUE_TEMPLATE/Documentation_Issue.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "Documentation Issue 📚"
-about: Report issues in our documentation
-title: ''
-labels: Issue-Docs
-assignees: ''
-
----
-
-<!-- Briefly describe which document needs to be corrected and why. -->
diff --git a/.github/ISSUE_TEMPLATE/Documentation_Issue.yml b/.github/ISSUE_TEMPLATE/Documentation_Issue.yml
new file mode 100644
index 00000000..4f2ffa3e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Documentation_Issue.yml
@@ -0,0 +1,10 @@
+name: "Documentation Issue 📚"
+description: Report issues in our documentation
+labels: ["Issue-Docs"]
+body:
+  - type: textarea
+    attributes:
+      label: Brief description of your issue
+      placeholder: Briefly describe which document needs to be corrected and why
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
deleted file mode 100644
index e7a9dca6..00000000
--- a/.github/ISSUE_TEMPLATE/Feature_Request.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: "Feature Request/Idea 🚀"
-about: Suggest a new feature or improvement (this does not mean you have to implement
-  it)
-title: ''
-labels: Issue-Feature
-assignees: ''
-
----
-
-<!-- 
-🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
-
-I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
-1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
-2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
-3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
-4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
-5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
-
-All good? Then proceed!
--->
-
-# Description of the new feature/enhancement
-
-<!-- 
-A clear and concise description of what the problem is that the new feature would solve.
-Describe why and how a user would use this new functionality (if applicable).
--->
-
-# Proposed technical implementation details (optional)
-
-<!-- 
-A clear and concise description of what you want to happen.
--->
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.yml b/.github/ISSUE_TEMPLATE/Feature_Request.yml
new file mode 100644
index 00000000..9f760003
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_Request.yml
@@ -0,0 +1,18 @@
+name: "Feature Request/Idea 🚀"
+description: Suggest a new feature or improvement (this does not mean you have to implement it)
+labels: ["Issue-Feature"]
+body:
+  - type: textarea
+    attributes:
+      label: Description of the new feature / enhancement
+      placeholder: |
+        A clear and concise description of what the problem is that the new feature would solve.
+        Describe why and how a user would use this new functionality (if applicable).
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed technical implementation details
+      placeholder: A clear and concise description of what you want to happen
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..05f9b29b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:  
+  - name: General Question
+    url: https://github.com/microsoft/winget-create/discussions/new
+    about: Have a question on something? Start a new discussion thread.
+  - name: Review open issues
+    url: https://github.com/microsoft/winget-create/issues
+    about: Please check if your issue or a similar issue has already been submitted
\ No newline at end of file