diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
index fad4c55..cc12b25 100644
--- a/.github/ISSUE_TEMPLATE/1_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.md
@@ -1,11 +1,10 @@
 ---
 name: "\U0001F41B Bug report"
 about: Report a misbehavior or other bug
-title: ''
 labels: 'bug'
-assignees: ''
 ---
-<!--- Provide a general summary of the issue in the Title above -->
+# Summary
+<!--- Provide a general summary of the bug report -->
 
 ## Expected behavior
 <!--- Describe what you expected to happen -->
@@ -15,21 +14,10 @@ assignees: ''
 
 ## Steps to Reproduce
 <!--- An unambiguous set of steps to reproduce this bug. -->
-<!--- Code-snippets, screenshots ot other details are welcome if needed. -->
+<!--- Code-snippets, screenshots or other details are welcome if needed. -->
 1.
 2.
 3.
-...
-
-## Context (Environment)
-<!--- Providing context helps us nail down where the issue might be located. -->
-<!--- The below checklist is not a must-fill-out but rather a guideline what can be interesting here. You're welcome to write additional text as well. -->
-- [ ] RViz
-- [ ] Simulator
-- [ ] Robot
-- [ ] Local
 
 ## Possible Solution
-<!--- NOT OBLIGATORY -->
-<!--- If you already have an idea, you can suggest a fix/reason for the bug -->
-
+<!--- Optional: If you already have an idea, you can suggest a fix/reason for the bug -->
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
index 4aad9e5..875cf49 100644
--- a/.github/ISSUE_TEMPLATE/2_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/2_feature_request.md
@@ -3,14 +3,10 @@ name: "\U0001F680 Feature request"
 about: Suggest an idea for this project
 labels: 'enhancement'
 ---
+# Summary
+<!--- Provide a general summary of the feature request -->
 
-<!--
-Thank you for suggesting an idea to make us better.
-
-Please fill in as much of the template below as you're able.
--->
-
-## Is your feature request related to a problem? Please describe.
+## Is your feature request related to a problem?
 <!-- Please describe the problem you are trying to solve. -->
 
 ## Describe the solution you'd like
@@ -18,5 +14,4 @@ Please fill in as much of the template below as you're able.
 
 ## Describe alternatives you've considered
 <!-- Please describe alternative solutions or features you have considered. -->
-<!-- This is not strictly neccessary but helps all of us get a different point-of-view -->
-
+<!-- This is not strictly necessary but helps all of us get a different point-of-view -->
diff --git a/.github/ISSUE_TEMPLATE/3_need_help.md b/.github/ISSUE_TEMPLATE/3_need_help.md
index 75b65cd..48cba38 100644
--- a/.github/ISSUE_TEMPLATE/3_need_help.md
+++ b/.github/ISSUE_TEMPLATE/3_need_help.md
@@ -1,14 +1,11 @@
 ---
-name: "⁉️ Need help?"
+name: "⁉️ Help me"
 about: "Get help with using or improving our software"
-title: ''
-labels: ''
-assignees: ''
+labels: 'question'
 ---
-
 <!--- If you have a question about any of our projects that is not a bug report or feature request, you can write us an issue like this or send a message to info@bit-bots.de -->
 
-## What I'm trying to do
+# What I'm trying to do
 <!--- Please describe what you're trying to do so we know what your problem is about -->
 
 ## What I've tried
@@ -16,4 +13,3 @@ assignees: ''
 
 ## Additional context
 <!--- If there's more to say, feel free to do so :) -->
-
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ff7abe1..41cf5a8 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,6 @@
+# Summary
+<!--- Provide a general summary of the changes -->
+
 ## Proposed changes
 <!--- Describe your changes and why they are necessary. -->
 
@@ -6,12 +9,11 @@
 <!--- If you suggest a new feature, please discuss it in an issue first. -->
 <!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
 
-## Necessary checks
-- [ ] Update package version
-- [ ] Run `catkin build`
+## Checklist
+
+- [ ] Run `colcon build`
 - [ ] Write documentation
 - [ ] Create issues for future work
 - [ ] Test on your machine
 - [ ] Test on the robot
-- [ ] Put the PR on our Project board
-
+- [ ] This PR is on our `Software` project board