diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..688f5e35
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,50 @@
+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: |
+        - EHRbase version:
+        - openEHR_SDK version:
+        - Num-portal 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/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 6bb0a6ac..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[Feature Request] Title of the feature request"
-labels: ''
-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.
-
-**Approved?**
-The status if the product owner has approved thos request
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..8382bd6b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,29 @@
+name: Feature Request
+description: Feature request for a new / extended functionality
+labels: ["feature"]
+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: checkboxes
+    attributes:
+      label: Approved
+      description: Add any other context or screenshots about the feature request here.
+      options:
+        - label: I have discussed the topic with Dirk
+          required: true
+  - type: textarea
+    attributes:
+      label: Further information
+      description: Add additional information, if needed.
+    validations:
+      required: false
\ No newline at end of file