6 files changed, 144 insertions, 70 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index b167f8adb..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-name: Bug report
-about: Create a bug report (please do not report security issues here)
-labels: bug
-
----
-
-<!-- Please do not report any security issue here, see file Contributing.adoc -->
-
-## Bug summary
-
-
-
-## Steps to reproduce
-
-1. 
-2. 
-3. 
-
-## Current behavior
-
-
-
-## Expected behavior
-
-
-
-## Suggested solutions
-
-
-
-## Additional information
-
-
-
----
-
-<!-- MANDATORY INFO: -->
-
-- WeeChat version: 
-- OS, distribution and version: 
-- Terminal: 
-- Terminal multiplexer (screen/tmux/…/none): 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..2265ea92d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,100 @@
+name: Bug report
+description: Create a bug report (please do not report security issues here)
+labels: ["bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: "Please do not report any security issue here, see [Contributing.adoc](../../Contributing.adoc)"
+
+  - type: textarea
+    id: summary-of-bug
+    attributes:
+      label: Summary of the bug
+      description: A clear and concise description of what the bug is.
+      placeholder: WeeChat crashes when doing a specific thing.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1.
+        2.
+        3.
+    validations:
+      required: true
+
+  - type: textarea
+    id: current-behavior
+    attributes:
+      label: Current behavior
+      description: What currently happens.
+      placeholder: WeeChat crashes with an error:…
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: What is actually supposed to happen.
+      placeholder: WeeChat does not crash.
+    validations:
+      required: true
+
+  - type: textarea
+    id: suggested-solutions
+    attributes:
+      label: Suggested solutions
+      description: How you think this issue can be resolved.
+      placeholder: This is caused by a faulty assertion in file.c, line 123, so maybe…
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional information
+      description: Any additional information you deem relevant.
+      placeholder: "Sounds like the same cause as issue #12345"
+    validations:
+      required: false
+
+  - type: input
+    id: weechat-version
+    attributes:
+      label: WeeChat version
+      description: "Use `weechat --version`"
+      placeholder: 4.1.1
+    validations:
+      required: true
+
+  - type: input
+    id: os-version
+    attributes:
+      label: "What OS and what version of it you run:"
+      description: Unsure? Go to https://whatsmyos.com/
+      placeholder: Debian 11
+    validations:
+      required: true
+
+  - type: input
+    id: terminal
+    attributes:
+      label: "What terminal you run WeeChat in:"
+      placeholder: xterm
+    validations:
+      required: true
+
+  - type: input
+    id: terminal-multiplexer
+    attributes:
+      label: "Specify what terminal multiplexer you run WeeChat in if any:"
+      placeholder: tmux/screen/…/none
+    validations:
+      required: true
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 40b8d405e..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: Feature request
-about: Request a new feature / enhancement
-labels: feature
-
----
-
-## Feature description
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..d50082a20
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,13 @@
+name: Feature request
+description: Request a new feature / enhancement
+labels: ["feature"]
+
+body:
+  - type: textarea
+    id: feature
+    attributes:
+      label: Feature description
+      description: A description of your feature.
+      placeholder: It would be really handy if WeeChat had…
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 8915bfc55..000000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: Question
-about: >
-  Ask a question (please read first FAQ and docs and ask on #weechat channel
-  before opening any question issue)
-labels: question
-
----
-
-<!-- Please read first FAQ/docs and ask on #weechat channel before opening any question issue -->
-
-## Question
-
-
-
----
-
-- WeeChat version: 
-- OS, distribution and version: 
diff --git a/.github/ISSUE_TEMPLATE/question.yaml b/.github/ISSUE_TEMPLATE/question.yaml
new file mode 100644
index 000000000..0d8ef5048
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yaml
@@ -0,0 +1,31 @@
+name: Question
+description: "Ask a question (please read the FAQ and docs first and ask in #weechat)."
+labels: ["question"]
+
+body:
+  - type: textarea
+    id: question
+    attributes:
+      label: Question
+      description: A clear and concise question.
+      placeholder: How do I…
+    validations:
+      required: true
+
+  - type: input
+    id: weechat-version
+    attributes:
+      label: WeeChat version
+      description: "Use `weechat --version`"
+      placeholder: 4.1.1
+    validations:
+      required: true
+
+  - type: input
+    id: os-version
+    attributes:
+      label: "What OS and what version of it you run:"
+      description: Unsure? Go to https://whatsmyos.com/
+      placeholder: Debian 11
+    validations:
+      required: true