diff --git a/.github/ISSUE_TEMPLATE/01-badge-request.yml b/.github/ISSUE_TEMPLATE/01-badge-request.yml
new file mode 100644
index 0000000..66af22c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-badge-request.yml
@@ -0,0 +1,30 @@
+name: Badge Request
+description: Request a badge that you would like to see be added to the current badge list.
+title: "[Badge Request]: "
+labels: ["📛 badge request"]
+projects: ["inttter/md-badges"]
+assignees:
+ - inttter
+body:
+ - type: markdown
+ attributes:
+ value: |
+ ⚠️ **Make sure your badge is not a duplicate of one that already exists.** You can check this by searching the badge list using Ctrl F or ⌘ F and entering the name of the badge.
+
+ > If you are looking to add a badge to this repository yourself, view the contributing guidelines [here](https://github.com/inttter/md-badges/blob/main/CONTRIBUTING.md) and make a pull request.
+ - type: input
+ id: name
+ attributes:
+ label: Badge Name
+ description: What is the name of the badge?
+ placeholder: eg. ChatGPT
+ validations:
+ required: true
+ - type: textarea
+ id: description
+ attributes:
+ label: Description
+ description: Give a bit of detail about the badge, such as a URL to a website.
+ placeholder: This badge is for [NAME], which/who...
+ validations:
+ required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/02-issue-report.yml b/.github/ISSUE_TEMPLATE/02-issue-report.yml
new file mode 100644
index 0000000..2d05ddb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02-issue-report.yml
@@ -0,0 +1,32 @@
+name: Issue Report
+description: Report something that is bugged or incorrect.
+title: "[Bug]: "
+labels: ["🐛 bug"]
+projects: ["inttter/md-badges"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Check the issues page [here](https://github.com/inttter/md-badges/issues) to make sure your issue is not a duplicate.
+ - type: dropdown
+ attributes:
+ label: Type of Issue
+ description: Where does this issue occur?
+ options:
+ - Badge Display
+ - Badge Syntax
+ - Formatting
+ - Other
+ - type: textarea
+ attributes:
+ label: Description
+ description: Describe the issue you have and give any additional details.
+ placeholder: The issue is...
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Screenshots/Videos
+ description: If applicable, drag a screenshot or video into this box that shows this issue.
+ validations:
+ required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/badge-request.md b/.github/ISSUE_TEMPLATE/badge-request.md
deleted file mode 100644
index 78d47ce..0000000
--- a/.github/ISSUE_TEMPLATE/badge-request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Badge Request
-about: Request a badge that you would like to see be added to the current badge list.
-title: '[Request]:'
-labels: '📛 badge request'
----
-
-## Name
-
-
-
-## Description
-
-
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/report-an-issue.md b/.github/ISSUE_TEMPLATE/report-an-issue.md
deleted file mode 100644
index 8848ecb..0000000
--- a/.github/ISSUE_TEMPLATE/report-an-issue.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Report an issue
-about: Report something which is bugged or not right within the repository.
-title: '[Bug]:'
-labels: '🐛 bug'
----
-
-## Description
-
-
-
-## Example
-
-
-
-## Additional Context
-
-
\ No newline at end of file