diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 000000000..52837a68e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,18 @@
+---
+name: Bug
+about: Misbehaving tutorial
+---
+<!-- 
+       Support requests: please only on https://precice.discourse.group/
+
+       Please wrap any log messages (`./mysolver > out.log 2>&1`) with three backticks before and after:
+       ```
+       This is an error message
+       ```
+-->
+<!-- markdownlint-disable-file MD041 -->
+
+- Tutorials state (last commit / release):
+- Versions of solvers and adapters used:
+- preCICE version:
+- Log files:
diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
deleted file mode 100644
index f9bb0b5a6..000000000
--- a/.github/ISSUE_TEMPLATE/issue-template.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Issue template
-about: Check this out before opening an issue
-
----
-<!-- markdownlint-disable-file MD041 -->
-<!-- 
-       Hey! Thank you for reporting an issue!
-       Just to make sure: is this really an issue or do you need some help
-       with troubleshooting? Please use our community channels if you need help:
-       https://precice.org/community-channels.html
-       Thanks! :-)
-
-       Please wrap any error messages with three backticks before and after:
-       ```
-       This is an error message
-       ```
-
-       If this is a bug, please provide the following information.
-       You can generate log files with `./run.sh > solver.log 2>&1`.
--->
-
-- Tutorials state (last commit / release):
-- Versions of solvers and adapters used:
-- preCICE version:
-- Log files:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 96c288ce0..4750058f0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,8 +1,16 @@
-<!-- Please submit your Pull Request to the `develop` branch.
+## Description
 
-It may help to have a look at the file `CONTRIBUTING.md` for a few hints and guidelines. -->
+TODO
 
-Checklist:
+## Checklist
 
 - [ ] I added a summary of any user-facing changes (compared to the last release) in the `changelog-entries/<PRnumber>.md`.
-- [ ] I will remember to squash-and-merge, providing a useful summary of the changes of this PR.
+- [ ] New tutorial case (e.g., new `fluid-openfoam` folder for existing tutorial)? Add it to the respective `README.md`.
+- [ ] New tutorial? Update the website.
+  - Add a [sidebar entry](https://github.com/precice/precice.github.io/blob/master/_data/sidebars/tutorial_sidebar.yml)
+  - Add it to the [overview](https://github.com/precice/precice.github.io/blob/master/content/tutorials/tutorials.md)
+
+## Resources
+
+- [Contributing tutorials](https://precice.org/community-contribute-to-precice.html#contributing-tutorials)
+- [System tests documentation](https://precice.org/dev-docs-system-tests.html)
\ No newline at end of file