diff --git a/.github/ISSUE_TEMPLATE/custom-issue-template.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 93%
rename from .github/ISSUE_TEMPLATE/custom-issue-template.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index 3d44fd0..e4fde0c 100644
--- a/.github/ISSUE_TEMPLATE/custom-issue-template.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,5 +1,5 @@
 ---
-name: Issue & Bug Report Template
+name: Bug Report
 about: Standard bug and issue report template.
 title: ''
 labels: ''
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..4bc4a66
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,16 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: 'Feature Request: <idea here>'
+labels: enhancement
+assignees: ''
+
+---
+
+- [ ] My proposal does not exist in the [PLANNED & NOT PLANNED.md](https://github.com/flattool/warehouse/blob/main/PLANNED%20%26%20NOT%20PLANNED.md) document
+- [ ] I have not found any other opened issues on the same feature request
+- [ ] I believe this fits within Warehouse's scope of Flatpak management
+
+## Describe the feature idea in detail
+
+## If needed, provide any screenshots, mockups, or other items to help illustrate your point