diff --git a/.github/ISSUE_TEMPLATE/defect.yml b/.github/ISSUE_TEMPLATE/defect.yml
new file mode 100644
index 0000000..35d0e53
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/defect.yml
@@ -0,0 +1,49 @@
+name: Bug Report
+description: Report a bug encountered when working with EHRbase
+labels: ["bug"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Before reporting an issue
+      description: Please search to see if the issue is already reported, and try to reproduce the issue on the latest release.
+      options:
+        - label: I have searched existing issues
+          required: true
+        - label: I have reproduced the issue with the latest release
+          required: true
+  - type: textarea
+    attributes:
+      label: Environment information
+      description: To help reproducing your problem it is mandatory to give some information on the environment.
+      placeholder: |
+        - Migration tool version: 
+        - EHRbase version:
+        - PostgreSQL version:
+        - Java Runtime version:
+        - Operating System version:
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Describe the steps that you have taken until the unexpected behavior occurred. Please try to add as many details as possible, and include data and templates as attachments.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Describe the expected output / behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual result
+      description: Describe the wrong output / behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Further information
+      description: Add additional information, if needed.
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
new file mode 100644
index 0000000..181e388
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,28 @@
+name: Enhancement Request
+description: Enhancement request for a new / extended functionality of EHRbase
+labels: ["enhancement"]
+body:
+  - type: textarea
+    attributes:
+      label: Background
+      description: Describe the context and intention for this enhancement, such as the benefits and impacts on the user.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Enhancement
+      description: Provide specific preconditions, steps, requirements or expectations on the proposed enhancement.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Discussion
+      description: |
+        If there has been a discussion around the enhancement, provide a link to the discussion.
+        Please also check for ongoing discussions on the [openEHR discourse](https://discourse.openehr.org/tag/ehrbase).
+  - type: textarea
+    attributes:
+      label: Further information
+      description: Add additional information, if needed.
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/task.yml b/.github/ISSUE_TEMPLATE/task.yml
new file mode 100644
index 0000000..96f862b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yml
@@ -0,0 +1,28 @@
+name: Task Request
+description: A general task, e.g. research or other common work to be done
+labels: ["task"]
+body:
+  - type: textarea
+    attributes:
+      label: Background
+      description: Describe the goal of this task, and the expectations or impacts on EHRbase after this task has been completed.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Task specification
+      description: Add specific steps or work descriptions with the expected results.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Discussion
+      description: |
+        If there has been a discussion around the task, provide a link to the discussion.
+        Please also check for ongoing discussions on the [openEHR discourse](https://discourse.openehr.org/tag/ehrbase).
+  - type: textarea
+    attributes:
+      label: Further information
+      description: Add additional information, if needed.
+    validations:
+      required: false
\ No newline at end of file