diff --git a/.github/ISSUE_TEMPLATE/bug_template.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 50%
rename from .github/ISSUE_TEMPLATE/bug_template.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index a8b57bdd..29eddb95 100644
--- a/.github/ISSUE_TEMPLATE/bug_template.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,30 +6,26 @@ labels: 'bug, untriaged'
 assignees: ''
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+**What is the bug?**
+A clear and concise description of the bug.
 
-**To Reproduce**
+**How can one reproduce the bug?**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+**What is the expected behavior?**
 A clear and concise description of what you expected to happen.
 
-**Plugins**
-Please list all plugins currently enabled.
+**What is your host/environment?**
+ - OS: [e.g. iOS]
+ - Version [e.g. 22]
+ - Plugins
 
-**Screenshots**
+**Do you have any screenshots?**
 If applicable, add screenshots to help explain your problem.
 
-**Host/Environment (please complete the following information):**
-
-- OS: [e.g. iOS]
-- Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
+**Do you have any additional context?**
+Add any other context about the problem.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..a8199a10
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: OpenSearch Community Support
+    url: https://discuss.opendistrocommunity.dev/
+    about: Please ask and answer questions here.
+  - name: AWS/Amazon Security
+    url: https://aws.amazon.com/security/vulnerability-reporting/
+    about: Please report security vulnerabilities here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5713d7aa..6198f338 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,19 +1,18 @@
 ---
 name: 🎆 Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
+about: Request a feature in this project
+title: '[FEATURE]'
+labels: 'enhancement, untriaged'
 assignees: ''
 ---
+**Is your feature request related to a problem?**
+A clear and concise description of what the problem is, e.g. _I'm always frustrated when [...]_
 
-**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 [...]
-
-**Describe the solution you'd like**
+**What solution would you like?**
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+**What alternatives have you 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.
+**Do you have any additional context?**
+Add any other context or screenshots about the feature request here.
\ No newline at end of file