diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..5f26eb245
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,60 @@
+---
+name: Bug Report
+about: Please fill in as much information as possible
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### **Firmware Version:**
+
+The current firmware version on your Passport can be seen when starting the device as well as under Settings>Firmware>Current Version.
+
+- Firmware Version: [e.g., 2.2.0]
+
+### **Hardware Details:**
+
+- Passport Model: [e.g., Passport “Founder’s Edition”, Passport ”Batch 2”]
+
+### Software Wallet **Details:**
+
+- Software wallet in use: [e.g., Envoy, Sparrow Wallet, etc.]
+- Software wallet version: [e.g., 1.3.0]
+
+### **Issue Description:**
+
+**Current Behavior:**
+[Describe the issue you are experiencing in detail. Include any error messages or unexpected behavior you encountered while using the Passport hardware wallet.]
+
+**Expected Behavior:**
+[Describe what you expected to happen when using the wallet firmware.]
+
+### **Steps to Reproduce:**
+
+1. [First Step]
+2. [Second Step]
+3. [Third Step]
+4. [Additional Steps, if necessary]
+
+### **Screenshots:**
+
+[If applicable, add screenshots or images of the issue you encountered.]
+
+### **Additional Information:**
+
+[Add any other relevant information here, such as the software Bitcoin wallet app in use (including version), operating system used, or any specific configurations.]
+
+### **Impact:**
+
+- [ ]  Low: Minor issue with minimal impact on functionality.
+- [ ]  Medium: Moderate issue affecting wallet performance.
+- [ ]  High: Major issue severely impacting the security or functionality of the wallet.
+
+### **Related Issues:**
+
+[If you found any similar or related issues, provide links to them here.]
+
+### **Steps Taken to Resolve:**
+
+[If you have attempted any troubleshooting steps to resolve the issue, please describe them here.]
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..6065447df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,24 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### **Description:**
+
+[Describe the new feature or improvement you would like to see in the Passport firmware. Provide as much detail as possible about the functionality, use cases, and how it would benefit users.]
+
+### **Use Case:**
+
+[Explain the specific use case or scenario where this feature would be valuable.]
+
+### **Implementation Ideas:**
+
+[If you have any suggestions on how the feature could be implemented or any technical considerations, feel free to share them here.]
+
+### **Additional Context:**
+
+[Add any other relevant information, such as links to related resources or examples from other hardware wallets, that may help in understanding the feature request.]