diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..b4e9a93
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,37 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: bug
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+- OS: [e.g., Windows 10]
+- Browser: [e.g., Chrome, Safari]
+- Version: [e.g., 22]
+
+**Smartphone (please complete the following information):**
+- Device: [e.g., iPhone X]
+- OS: [e.g., iOS 14.4]
+- Browser: [e.g., stock browser, Safari]
+- Version: [e.g., 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..13f2859
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Issues and Suggestions
+    url: https://github.com/mss-boot-io/mss-boot-admin/issues/new
+    about: If none of the templates fit, you can submit a custom issue or suggestion.
diff --git a/.github/ISSUE_TEMPLATE/custom_issue.md b/.github/ISSUE_TEMPLATE/custom_issue.md
new file mode 100644
index 0000000..1b5d8a7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom_issue.md
@@ -0,0 +1,13 @@
+---
+name: Custom Issue
+about: Create a custom issue or suggestion
+title: ''
+labels: ''
+assignees: ''
+---
+
+**Issue or Suggestion**
+A clear and concise description of your issue or suggestion.
+
+**Relevant Information**
+Add any other context, information, or screenshots about the issue here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..17a2a88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: "[FEATURE] "
+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.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e49820c..496d740 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,38 @@
 ## Description
 
-<!-- A clear and concise description what these changes does. -->
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
-## Checklist
+Fixes # (issue)
 
-<!-- Replace  the [ ] with [x] to check the boxes. -->
+## Type of change
 
-- [ ] the pull request title describes what this PR does (not a vague title like `Update index.md`)
-- [ ] the pull request targets the _default_ branch of the repository (`main`)
-- [ ] tests are added for the changes I made (if any source code was modified)
-- [ ] documentation added or updated
-- [ ] I have run the project locally and verified that there are no errors
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+**Test Configuration**:
+* Firmware version:
+* Hardware:
+* Toolchain:
+* SDK:
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules