diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7756d19a31f..1f67ed80121 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,9 @@
 ---
 name: Bug report
 about: Create a report to help us improve Zephyr
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 00000000000..4ed407bcb9c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,20 @@
+---
+name: Enhancement
+about: Suggest enhancements to existing features
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your enhancement proposal related to a problem? Please describe.**
+A clear and concise description of what the problem is.
+
+**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 graphics (drag-and-drop an image) about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 197a5ea8a66..82f2f54b5f7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/rfc---proposal.md b/.github/ISSUE_TEMPLATE/rfc---proposal.md
new file mode 100644
index 00000000000..fbb1fc8a1e1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/rfc---proposal.md
@@ -0,0 +1,51 @@
+---
+name: RFC / Proposal
+about: Submit an RFC / Proposal
+title: ''
+labels: RFC
+assignees: ''
+
+---
+
+## Introduction
+
+This section targets end users, TSC members, maintainers and anyone else that might
+need a quick explanation of your proposed change.
+
+### Problem description
+
+Why do we want this change and what problem are we trying to address?
+
+### Proposed change
+
+A brief summary of the proposed change - the 10,000 ft view on what it will
+change once this change is implemented.
+
+## Detailed RFC
+
+In this section of the document the target audience is the dev team. Upon
+reading this section each engineer should have a rather clear picture of what
+needs to be done in order to implement the described feature.
+
+### Proposed change (Detailed)
+
+This section is freeform - you should describe your change in as much detail
+as possible. Please also ensure to include any context or background info here.
+For example, do we have existing components which can be reused or altered.
+
+By reading this section, each team member should be able to know what exactly
+you're planning to change and how.
+
+### Dependencies
+
+Highlight how the change may affect the rest of the project (new components,
+modifications in other areas), or other teams/projects.
+
+### Concerns and Unresolved Questions
+
+List any concerns, unknowns, and generally unresolved questions etc.
+
+## Alternatives
+
+List any alternatives considered, and the reasons for choosing this option
+over them.