diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 4aca8c7..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Something does not work as expected
-title: ''
-labels: bug
-assignees: ''
-
----
-
-### The problem
-<!-- 
-  Describe the issue you are experiencing here.
--->
-
-
-### Additional information
-<!-- 
-  Provide additional information, if any.
--->
-
-
-### API availability
-<!-- 
-  Place an 'x' between the brackets to indicate your answer.
--->
-What does the `API status` sensor report:
-
-* [ ] OK
-* [ ] Something else (please clarify): 
-* [ ] N/A
-
-### Diagnostics
-<!-- 
-  If you think it is applicable, download the diagnostics and attach it to this issue. Privacy related data is redacted. To not disclose your setup, you may delete everything but the data element.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..6518e04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,41 @@
+name: Bug report
+description: Something does not work as expected
+labels: ["bug"]
+
+body:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell what you expected to happen.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: api-status
+    attributes:
+      label: API availability
+      description: What does the `API status` sensor report? When selecting `Something else`, please clarify below in `Additional information`.
+      options:
+        - OK
+        - N/A
+        - Something else
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional information
+      description: Provide additional information, if any.
+    validations:
+      required: false
+
+  - type: textarea
+    id: diagnostics
+    attributes:
+      label: Diagnostics
+      description: If you think it is applicable, download the diagnostics and attach it to this issue. Privacy related data is redacted. To not disclose your setup, you may delete everything but the data element.
+      render: json
+    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 5c2fc05..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest an idea
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..7007114
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,12 @@
+name: Feature request
+description: Suggest an idea
+labels: ["enhancement"]
+
+body:
+  - type: textarea
+    id: idea
+    attributes:
+      label: Your idea
+      description: Share your idea as detailed as possible.
+    validations:
+      required: true