diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 38a470c7b..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Issue description
-<!-- A clear and concise description of what the issue is -->
-
-
-### To reproduce
-Steps to reproduce the behavior:
-
-1.
-2.
-3.
-
-
-### Environment
-
-- `constellation version`:
-- `constellation-conf.yaml`
-  - (make sure to remove sensitive information, e.g., `yq e 'del(.provider.*.project)' constellation-conf.yaml`)
-- VM type used to run Constellation.
-
-### Expected behavior
-<!-- A clear and concise description of what you expected to happen -->
-
-### Additional info / screenshot
-<!-- Any additional information or context -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..ad332995c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,25 @@
+name: Bug report
+description: File a bug report to help us improve
+labels: ["bug", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    attributes:
+      label: Issue description
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the behavior
+  - type: textarea
+    attributes:
+      label: Version
+      description: Output of `constellation version`
+  - type: textarea
+    attributes:
+      label: Constellation Config
+      description: Make sure to remove sensitive information, e.g., `yq e 'del(.provider.*.project)' constellation-conf.yaml`.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ebbee4726..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-### Use case
-<!-- A clear and concise description of what the problem is. -->
-
-### Describe your solution
-<!-- A clear and concise description of what you want to happen. -->
-
-### 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 000000000..08430ae42
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,18 @@
+name: Feature request
+description: Suggest an idea for this project
+body:
+  - type: textarea
+    attributes:
+      label: Use case
+      description: A concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe your solution
+      description: In case you have an idea how to implement this feature.
+  - type: checkboxes
+    attributes:
+      label: Would you be willing to implement this feature?
+      options:
+        - label: Yes, I could contribute this feature.