diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..35457d215
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,11 @@
+<!--
+Please take a look at the issue templates at https://github.com/Human-Connection/Human-Connection/issues/new/choose
+before submitting a new issue. Following one of the issue templates will ensure maintainers can route your request efficiently.
+
+Thanks!
+-->
+
+## Issue
+<!-- Describe your Issue in detail. -->
+
+<!-- Attach screenshots and drawings if needed. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fbb83adc2..8b0d890e2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,35 +1,31 @@
 ---
-name: Bug report
+name: 🐛 Bug report
 about: Create a report to help us improve
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## 🐛 Bugreport
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
 
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to 'http...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Steps to reproduce the behavior
+1.
+2.
+3.
+4. ...
+5. Profit
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+### Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
 
-**Additional context**
-Add any other context about the problem here.
+### Version & Environment
+ Type: []      <!-- [Desktop|Smartphone] -->
+ - OS: []      <!-- [e.g. iOS8.1 or Windows] -->
+ - Browser: [] <!-- [e.g. stock browser, safari, chrome] -->
+ - Version []  <!-- [e.g. 22] -->
+ - Device: []  <!-- [e.g. iPhone6] -->
+
+### Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 066b2d920..4b0493ac8 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,17 +1,26 @@
 ---
-name: Feature request
+name: 🚀 Feature request
 about: Suggest an idea for this project
 
 ---
 
-**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 [...]
+## 🚀 Feature
+<!-- Describe the Feature. -->
 
-**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.
+### 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 [...] -->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+
+### Describe the prefered solution and alternatives you've considered
+<!-- A clear and concise description of what you want to happen.
+Are there any alternative solutions or features you've considered? -->
+
+
+### Design & Layout
+<!-- Attach Screenshots and Drawings. -->
+
+
+### Additional context
+<!-- Add any other context or screenshots about the feature request here.-->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..0999221f4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,10 @@
+---
+name: 💬 Question
+about: If you need help understanding HumanConnection.
+---
+<!-- Chat with Team HumanConnection -->
+<!-- If you need an answer right away, visit the HumanConnection Discord:
+https://discord.gg/Q3mpcgr -->
+
+## 💬 Question
+<!-- Describe your Question in detail. Include screenshots and drawings if needed. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..e67351c41
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,28 @@
+## Pullrequest
+<!-- Describe the Pullrequest. -->
+
+### Issues
+<!-- Which Issues does this fix, which are related?
+- fixes #XXX
+- relates #XXX
+-->
+- [X] None
+
+### Checklist
+<!-- Anything important to be thought of when deploying?
+- [ ] Env-Variables adjustment needed
+- [ ] Breaking/critical change
+-->
+- [X] None
+
+### How2Test
+<!-- Give a detailed description how to test your PR and confirm it is working as expected. -->
+<!-- Maintainers will check the Tests
+- [ ] Test1
+- [ ] Test2
+-->
+- [X] None
+
+### Todo
+<!-- In case some parts are still missing, list them here. -->
+- [X] None
diff --git a/.gitignore b/.gitignore
index 7d30b9530..07094a43b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,6 @@ yarn-error.log*
 .eslintcache
 kubeconfig.yaml
 
-/.github
-
 node_modules/
 cypress/videos
 cypress/screenshots/