diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7c265e42..5a8389b1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -35,9 +35,9 @@ If you add screenshots, reduce the size or use thumbnails to keep the issue nice
 **App version**
 <!-- Which version of this app is affected? If you build the app yourself, please specify the latest commit included in the build -->
 
-**Device (please complete the following information):**
- - Model: <!-- [e.g. Samsung Galaxy S9] -->
- - OS: <!-- [e.g. Android 10] (add details if you are not using a version provided by the device manufacturer) -->
+**Device:**
+ - Model: [e.g. Samsung Galaxy S9]
+ - OS: [e.g. Android 10] (please also mention whether you are using the manufacturer's OS or a custom ROM)
 
 **Additional context**
 <!-- Add any other context about the problem here. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f18e2fc8..d02b92db 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,12 @@
 <!--
-* Please describe briefly what your pull request proposes to fix or improve.
+See the contributing section in the readme for more detailed guideline: https://github.com/Helium314/HeliBoard?tab=readme-ov-file#guidelines
+Most importantly:
+* The PR should focus on a single contribution.
+* Describe briefly what your pull request proposes to fix or improve.
 * If it's not completely obvious, describe what the PR does to achieve the desired result.
+
+Further
 * If you use someone else's code, please mention or better link to the source.
-* See the contributing section in the readme for more detailed guideline: https://github.com/Helium314/HeliBoard?tab=readme-ov-file#guidelines
+* When the PR contains "fixes" <issue number>, the related issue will be linked and automatically closed if the PR is merged (also works for other words like "fix", "resolve", "resolves", "closes", ...)
+* If you add a layout, make sure you have read https://github.com/Helium314/HeliBoard/blob/main/layouts.md#adding-new-layouts--languages
 -->