diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..dd84ea7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+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. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - 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/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 0000000..48d5f81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a457712..bbcbbe7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,37 +1,20 @@
-# Feature Request Template  
-
-## Summary  
-
-Provide a clear and concise summary of the feature you are requesting.  
-
-**What problem does this feature solve?**  
-(Explain the challenge or need this feature would address.)  
-
-**How does this align with the goals of the Murrieta Design System?**  
-(Explain how this feature supports the design system’s principles or purpose.)  
-
 ---
-
-## Proposed Solution  
-
-Describe your proposed solution in detail:  
-
-- **Feature Overview**: What would the feature do?  
-- **User Stories**: (Optional) Include specific user stories or use cases.  
-- **Visuals**: (Optional) Attach wireframes, mockups, or diagrams to illustrate the feature.  
-
----
-
-## Alternatives Considered  
-
-List any alternative solutions or approaches you’ve thought of and why you believe your proposal is the best option.  
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
 
 ---
 
-## Additional Information  
+**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 [...]
 
-Add any other context, links, or resources that might help in evaluating your feature request.  
+**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.
 
-Thank you for helping to make the Murrieta Design System better! 🚀
+**Additional context**
+Add any other context or screenshots about the feature request here.