diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..d2f44ce24a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '[bug]: '
+labels: "\U0001F41E bug"
+assignees: ''
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**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]
+
+**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.
diff --git a/.github/ISSUE_TEMPLATE/component-v2.md b/.github/ISSUE_TEMPLATE/component-v2.yml
similarity index 84%
rename from .github/ISSUE_TEMPLATE/component-v2.md
rename to .github/ISSUE_TEMPLATE/component-v2.yml
index a7cdfcca2d..a2577747d4 100644
--- a/.github/ISSUE_TEMPLATE/component-v2.md
+++ b/.github/ISSUE_TEMPLATE/component-v2.yml
@@ -1,9 +1,9 @@
 name: Component v2
 description: Add a working item for a component targeted at the new Design v2
-title: "[component]: "
-labels: ["📦 components"]
-projects: ["swisspost/3"]
-milestone: "Design v2"
+title: '[component]: '
+labels: ['📦 components']
+projects: ['swisspost/3']
+milestone: 'Design v2'
 assignees: []
 body:
   - type: textarea
@@ -32,9 +32,10 @@ body:
     id: tasks
     attributes:
       label: Tasks
+      description: Default tasks for the dev team. Can be edited later according to needs.
       value: |
         ```[tasklist]
-        ### Tasks
+        ### 💻 Tasks
         - [ ] HTML/CSS implementation
         - [ ] Web component implementation
         - [ ] Documentation in Storybook
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..0086358db1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..67a3d5d9a9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: '✨ feature'
+assignees: ''
+---
+
+**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 [...]
+
+**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.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.