diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
new file mode 100644
index 000000000..f29f46ccb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+labels: bug
+
+---
+
+## Current behavior
+<!--  Describe the current behavior pointing exactly why it's not working as intended. -->
+
+
+## Expected behavior
+<!-- Describe what the desired behavior should be. -->
+
+
+## Steps to reproduce the issue
+<!-- Please provide the steps to reproduce and if possible a *minimal reproducible example* of the problem -->
+
+
+## Can you handle fixing this bug by yourself?
+
+- [ ] YES
+- [ ] NO
+
+## Environment details
+<!-- Please provide all the informations required below. -->
+- Browser: <!-- Your browser, version -->
+- OS: <!-- Your operating system, version -->
+- Code Version: <!-- Tag, branch or commit determining which version of code is used -->
+
+## Additional information
+<!-- If you think that any additional information would be useful, please provide them here. -->
+
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
new file mode 100644
index 000000000..4b7e684bd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+labels: feature request
+
+---
+
+## What is the motivation for adding/enhancing this feature?
+<!-- Describe the motivation or the concrete use case for a new feature or why one of the current ones should be enhanced. -->
+
+
+## What are the acceptance criteria?
+<!-- List the acceptance criteria for this task in the form of a list. -->
+
+- [ ] ...
+
+## Can you complete this feature request by yourself?
+
+- [ ] YES
+- [ ] NO
+
+## Additional information
+<!-- If you think that any additional information would be useful, please provide them here. -->
+
diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md