diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 000000000..b8c8b4556
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,18 @@
+name: 🐛 Bug
+description: Report an issue to help improve the project.
+labels: ['bug']
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A brief description of the question or issue, also include what you tried and what didn't work
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Please add screenshots if applicable
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..07f7f80c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,19 @@
+name: 💡 General Feature Request
+description: Have a new idea/feature? Please suggest!
+title: 'Feature: '
+labels: ['feature']
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Description of the enhancement you propose, also include what you tried and what worked.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: Screenshots if applicable
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/workflows/pull_request_template.md b/.github/workflows/pull_request_template.md
new file mode 100644
index 000000000..dd7c9d71f
--- /dev/null
+++ b/.github/workflows/pull_request_template.md
@@ -0,0 +1,21 @@
+### Description
+<!-- Provide a brief description of the changes in this pull request -->
+
+### Proposed Changes
+<!-- List the proposed changes introduced by this pull request -->
+
+## Fixes #(issue_no)
+
+Replace `issue_no` with the issue number which is fixed in this PR
+
+## Screenshots
+
+<!-- If applicable, add screenshots or images demonstrating the changes made -->
+
+## Checklist
+
+<!-- Mark the completed tasks with [x] -->
+- [ ] Tests have been added or updated to cover the changes
+- [ ] Documentation has been updated to reflect the changes
+- [ ] Code follows the established coding style guidelines
+- [ ] All tests are passing
\ No newline at end of file