diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5d0dbb594..f951a83be 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,15 +1,28 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
+name: 🐞 Bug report
+about: Help us improving by reporting a bug
 labels: bug
-assignees: ''
-
 ---
 
+<!--
+Guidelines for submitting issues:
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+* This repository is *only* for issues within the Nextcloud Notes Android app
+-->
+
+<!-- Please keep this note for other contributors -->
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
+
+
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
 
+
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
@@ -17,21 +30,24 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
+
 **Expected behavior**
 <!-- A clear and concise description of what you expected to happen. -->
 
+
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 
-**Server**
- - Nextcloud-Version: 
- - Nextcloud Notes-Version (server app): 
- - PHP-Version: 
 
 **Smartphone (please complete the following information):**
  - Nextcloud Notes-Version (android app): 
  - F-Droid or Play Store: 
- - Device: [e.g. Samsung Galaxy S10]
- - Android-Version: [e.g. 8]
+ - Android-Version: 
+ - Device: 
+
+
+**Server**
+ - Nextcloud version: 
+ - Nextcloud Notes version (server app): 
 
 **Stacktrace**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 745df9ea6..62b7cb1db 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,12 +1,23 @@
 ---
-name: Feature request
+name: 🚀 Feature request
 about: Suggest an idea for this project
-title: ''
 labels: Enhancement
-assignees: ''
-
 ---
 
+<!--
+Guidelines for submitting issues:
+
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+* This repository is *only* for issues within the Nextcloud Notes Android app
+-->
+
+<!-- Please keep this note for other contributors -->
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
+
 **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 [...] -->