diff --git a/.github/ISSUE_TEMPLATE/bug-report---.md b/.github/ISSUE_TEMPLATE/bug-report---.md
index 6a8b3a8..ee9ea13 100644
--- a/.github/ISSUE_TEMPLATE/bug-report---.md
+++ b/.github/ISSUE_TEMPLATE/bug-report---.md
@@ -1,25 +1,22 @@
 ---
 name: "Bug report \U0001F41E"
-about: Create a report to help us improve
+about: Create a bug report
+labels: bug
 
 ---
 
-## Description
+**Describe the bug:**
+A clear and concise description of what the bug is.
 
-Describe the issue that you're seeing.
+**Steps to reproduce:**
+Steps to reproduce the behavior.
 
-### Steps to reproduce
+**Expected behavior:**
+A clear and concise description of what you expected to happen.
 
-Clear steps describing how to reproduce the issue. Please please please link to a demo project if possible, this makes your issue _much_ easier to diagnose (seriously).
+**Environment:**
+ - OS: [e.g. Arch Linux]
+ - Other details that you think may affect.
 
-### Expected result
-
-What should happen?
-
-### Actual result
-
-What happened.
-
-### Environment
-
-Paste the information here as shown by `npm run check`
+**Additional context:**
+Add any other context about the problem here.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature-request---.md b/.github/ISSUE_TEMPLATE/feature-request---.md
index 201a849..e893a17 100644
--- a/.github/ISSUE_TEMPLATE/feature-request---.md
+++ b/.github/ISSUE_TEMPLATE/feature-request---.md
@@ -1,17 +1,18 @@
 ---
 name: "Feature request \U0001F680"
 about: Suggest an idea
+labels: enhancement
 
 ---
 
-## Summary
+**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 [...]
 
-Brief explanation of the feature.
+**Describe the solution you'd like:**
+A clear and concise description of what you want to happen.
 
-### Basic example
+**Describe alternatives you've considered:**
+A clear and concise description of any alternative solutions or features you've considered.
 
-Include a basic example or links here.
-
-### Motivation
-
-Why are we doing this? What use cases does it support? What is the expected outcome?
+**Additional context:**
+Add any other context about the feature request here.
diff --git a/README.md b/README.md
index 957abef..dc563b8 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ Find out more at [WebhookAlerts.com](https://webhookalerts.com). Got a question?
 ![Webhook Bot](https://i.imgur.com/vZA42cc.png)
 
 ## How can I help?
-All kinds of contributions are welcome 🙌! The most basic way to show your support is to `⭐️ star` the project, or raise [`🐞 issues`](https://github.com/fabston/TradingView-Webhook-Bot/issues/new). You can also support this project by becoming a [sponsor on GitHub](https://github.com/sponsors/fabston) to ensure this journey continues indefinitely! 🚀
+All kinds of contributions are welcome 🙌! The most basic way to show your support is to `⭐️ star` the project, or raise [`🐞 issues`](https://github.com/fabston/TradingView-Webhook-Bot/issues/new/choose). You can also support this project by becoming a [sponsor on GitHub](https://github.com/sponsors/fabston) to ensure this journey continues indefinitely! 🚀
 
 ***