diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 1225d4becf..0000000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: "\U0001F41BBug report"
-about: Something is wrong with React Router.
----
-
-<!--
-Thank you for contributing!
-
-Have a usage question?
-======================
-The issue tracker is meant for bug reports only. This isn't the best place for usage questions. Questions here don't have as much visibility as they do elsewhere. Before you ask a question, here are some resources to get help first:
-
-- Read the docs: https://reacttraining.com/react-router
-- Check out the list of frequently asked questions: https://github.com/ReactTraining/react-router/blob/master/FAQ.md
-- Explore examples: https://reacttraining.com/react-router/web/example/basic
-- Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/ask?tags=react-router
-- Ask in chat: https://discord.gg/6RyV8n8yyM
-
-Think you found a bug?
-======================
-The best bug report is a failing test in the repository as a pull request. Otherwise, please use the "BUG REPORT" template below.
-
-Have a feature request?
-=======================
-Remove the template from below and provide thoughtful commentary *and code samples* on what this feature means for your product. What will it allow you to do that you can't do today? How will it make current work-arounds straightforward? What potential bugs and edge cases does it help to avoid? etc. Please keep it product-centric.
--->
-
-<!-- BUG TEMPLATE -->
-
-## Version
-
-**Please replace this sentence with the React Router version that you are using.**
-
-## Test Case
-
-https://codesandbox.io/s/react-router-gh6n7
-
-## Steps to reproduce
-
-## Expected Behavior
-
-## Actual Behavior
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..fd302e64d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,47 @@
+name: 🐛 Bug Report
+description: Something is wrong with React Router.
+title: "[Bug]: "
+body: 
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for contributing!
+        
+        Do you need some help?
+        ======================
+        The issue tracker is meant for feature requests and bug reports only. This isn't the best place for 
+        support or usage questions. Questions here don't have as much visibility as they do elsewhere. Before 
+        you ask a question, here are some resources to get help first:
+
+        - Read the docs: https://reacttraining.com/react-router
+        - Check out the list of frequently asked questions: https://github.com/ReactTraining/react-router/blob/master/FAQ.md
+        - Explore examples: https://reacttraining.com/react-router/web/example/basic
+        - Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/ask?tags=react-router
+        - Ask in chat: https://discord.gg/6RyV8n8yyM
+        
+        ### Test Case Starter:
+        https://codesandbox.io/s/react-router-gh6n7
+  - type: input
+    attributes:
+      label: What version of React Router are you using?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+