diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 1575409c59..ebd3123ce3 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,12 +1,32 @@
 ---
 name: "\U0001F41BBug report"
-about: Create a report to help us improve
+about: File a connector bug here!
 
 ---
 
+Remember to include sufficient details and context. If you have multiple bugs, please submit them in separate issues.
+
+
+**Type of Connector**
+
+- [ ] certified 
+- [ ] custom 
+- [ ] independent publisher
+
+**Name of Connector**
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+**Is this a security bug?**
+- [ ] yes
+- [ ] no
+
+**What is the severity of this bug?**
+- [ ] severity 1: Connector is broken or there's a very serious issue
+- [ ] severity 2: One or more important connector features are down
+- [ ] severity 3: Minor issue
+
 **To Reproduce**
 Steps to reproduce the behavior.
 
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index d062eb22e7..7420487963 100644
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,9 +1,19 @@
 ---
 name: "\U0001F680Feature request"
-about: Suggest an idea for this project
+about: Suggest an idea for an existing connector in this repository!
 
 ---
 
+New ideas for existing connectors can include support for new actions, triggers, and support for more endpoints. If you need to submit a request for a new connector, please use the New connector request template.
+
+**Type of Connector**
+
+- [ ] certified 
+- [ ] custom 
+- [ ] independent publisher
+
+**Name of Connector**
+
 **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 [...]
 
diff --git a/.github/ISSUE_TEMPLATE/New_connector_request.md b/.github/ISSUE_TEMPLATE/New_connector_request.md
new file mode 100644
index 0000000000..75f9f07b5f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/New_connector_request.md
@@ -0,0 +1,13 @@
+---
+name : 💡New connector request
+about : Specify a connector that you need!
+---
+
+**Name of the end service**
+
+**Describe the potential use cases for this connector**
+
+**What would be the most helpful actions and triggers for this connector?**
+
+**Additional context**
+Add any other context about this new connector.