diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3a058c8b6c..a6c06597fa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Something looks wierd or doesn't work as expected? Let us know the details so we can fix it!
 title: "[BUG]: "
 labels: bug
 assignees: ''
@@ -8,25 +8,28 @@ assignees: ''
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+Please give us a clear and concise description of what the bug is, including screenshots or video if applicable.
+
 
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Scroll down to '....'
+3. Click on '....'
 4. See error
 
+
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+Please describe what you expected to happen.
+
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Operating Environment(s):**
+ - OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
+ - OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
+ - AtomicDEX Version: [e.g. 0.5.7]
+ - Build branch: [e.g. master/dev] 
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
 
 **Additional context**
-Add any other context about the problem here.
+ - Add any related context about the problem here (e.g. screen resolution, mining activity on address)
+ - Attach [log files](https://forum.komodoplatform.com/t/accessing-atomicdex-desktop-log-files/540)
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 89af96c70e..11f973fa6c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,24 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE REQUEST]: "
+about: Something missing? Got a cool idea? Let us know!
+title: "[FR]: "
 labels: ''
 assignees: ''
 
 ---
 
 **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 [...]
+What problem does your suggestion solve? E.g. It would be more convenient if [...]
+
+
+**Describe your solution**
+A clear and concise description of how your solution could be implemented.
 
-**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.
+Have you considered any alternative approaches to solving to the problem?
+
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+For visual features, screenshots are great to include.
+If your request is similar to a feature frm a different app, please include a link.
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
new file mode 100644
index 0000000000..c3b49f6c2a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -0,0 +1,12 @@
+---
+name: Support query
+about: Did something go wrong? Need some help? Please follow the links below for assistance
+title: "[SQ]: "
+labels: 'support'
+assignees: ''
+
+---
+
+[Komodo Platform Discord Support Channel](https://discord.gg/RRZ8hzc)
+[Komodo Platform Forum](https://forum.komodoplatform.com/t/atomicdex-desktop-collection/541)
+[Develper Documentation](https://developers.komodoplatform.com/)
\ No newline at end of file