diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e211579..759b673 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,31 +1,33 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
+name: Bug Report
+about: Create a report to help us improve!
+title: '[BUG]'
+labels: 'kind/bug'
 assignees: ''
-
 ---
 
-<!-- Thanks for helping us to improve Hauler! We welcome all bug reports. Please fill out each area of the template so we can better help you. Comments like this will be hidden when you post but you can delete them if you wish. -->
+<!-- Thank you for helping us to improve Hauler! We welcome all bug reports. Please fill out each area of the template so we can better help you. Comments like this will be hidden when you post but you can delete them if you wish. -->
 
-**Environmental Info:**  
+**Environmental Info:**
+*
 
 **Hauler Version:**
+*
 
 **System CPU architecture, OS, and Version:**
-<!-- Provide the output from "uname -a" on the system where Hauler is installed -->
+* <!-- Provide the output from "uname -a" on the system where Hauler is installed -->
 
 **Describe the bug:**
-<!-- A clear and concise description of what the bug is. -->
+* <!-- A clear and concise description of the bug. -->
 
 **Steps To Reproduce:**
+* <!-- A clear and concise way to reproduce the bug. -->
 
 **Expected behavior:**
-<!-- A clear and concise description of what you expected to happen. -->
+* <!-- A clear and concise description of what you expected to happen, without the bug. -->
 
 **Actual behavior:**
-<!-- A clear and concise description of what actually happened. -->
+* <!-- A clear and concise description of what actually happened. -->
 
 **Additional context / logs:**
-<!-- Add any other context and/or logs about the problem here. -->
+* <!-- Add any other context and/or logs about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..6f65bf9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature Request
+about: Create a report to help us improve!
+title: '[RFE]'
+labels: 'kind/rfe'
+assignees: ''
+---
+
+<!-- Thanks for helping us to improve Hauler! We welcome all requests for enhancements (RFEs). Please fill out each area of the template so we can better help you. Comments like this will be hidden when you post but you can delete them if you wish. -->
+
+**Is your feature request related to a problem? Please describe.**
+* <!-- A clear and concise description of the problem. -->
+
+**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. -->
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ada5359..7dd924e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,20 @@
-* **Please check if the PR fulfills these requirements**
-- [ ] The commit message follows our guidelines
-- [ ] Tests for the changes have been added (for bug fixes / features)
-- [ ] Docs have been added / updated (for bug fixes / features)
+**Please check below, if the PR fulfills these requirements:**
+- [ ] The commit message follows the guidelines.
+- [ ] Tests for the changes have been added (for bug fixes / features).
+- [ ] Docs have been added / updated (for bug fixes / features).
 
 
-* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+**What kind of change does this PR introduce?**
+* <!-- Bug fix, feature, docs update, ... -->
 
+**What is the current behavior?**
+* <!-- You can also link to an open issue here -->
 
+**What is the new behavior (if this is a feature change)?**
+* <!-- What changes did this PR introduce? -->
 
-* **What is the current behavior?** (You can also link to an open issue here)
+**Does this PR introduce a breaking change?**
+* <!-- What changes might users need to make in their application due to this PR? -->
 
-
-
-* **What is the new behavior (if this is a feature change)?**
-
-
-
-* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
-
-
-
-* **Other information**:
\ No newline at end of file
+**Other information**:
+* <!-- Any additional information -->
\ No newline at end of file