diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 84%
rename from .github/ISSUE_TEMPLATE/BUG_REPORT.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 0eda947..bf7d806 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -5,10 +5,10 @@ labels: ["bug"]
 body:
   - type: checkboxes
     attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
+      label: Is there an existing bug report for this?
+      description: Please search to see if a report already exists for the bug you encountered.
       options:
-      - label: I have searched the existing issues
+      - label: I have searched the existing bug reports
         required: true
   - type: input
     id: cpu
@@ -30,8 +30,8 @@ body:
     id: docker
     attributes:
       label: Docker version
-      description: The version of Docker (as shown by `docker -v`).
-      placeholder: e.g. Docker version 26.0.1, build d260a54
+      description: The version of the Docker engine (as shown by `docker -v`).
+      placeholder: e.g. 26.0.1
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
rename to .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/ISSUE_TEMPLATE/issue.yml b/.github/ISSUE_TEMPLATE/issue.yml
new file mode 100644
index 0000000..7e4739c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.yml
@@ -0,0 +1,62 @@
+name: "\U0001F6A8 Technical issue"
+description: When you're experiencing problems using the container
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if a solution already exists for your issue.
+      options:
+      - label: I have searched the existing issues
+        required: true
+  - type: input
+    id: cpu
+    attributes:
+      label: Machine specifications
+      description: The processor and RAM amount in your machine.
+      placeholder: e.g. Raspberry Pi 5 / 8 GB 
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: Operating system
+      description: The distribution and kernel version (as shown by `uname -a`).
+      placeholder: e.g. Ubuntu 24.04 / Kernel 6.8.0-22-generic
+    validations:
+      required: true
+  - type: input
+    id: docker
+    attributes:
+      label: Docker version
+      description: The version of the Docker engine (as shown by `docker -v`).
+      placeholder: e.g. 26.0.1
+    validations:
+      required: true
+  - type: textarea
+    id: summary
+    attributes:
+      label: Description
+      description: A clear and concise description of your issue.
+    validations:
+      required: true
+  - type: textarea
+    id: compose
+    attributes:
+      label: Docker compose
+      description: The compose file (or otherwise the `docker run` command used).
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Docker log
+      description: The logfile of the container (as shown by `docker logs qemu`).
+    validations:
+      required: true
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: Screenshots (optional)
+      description: Screenshots that might help to make the problem more clear.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yml b/.github/ISSUE_TEMPLATE/question.yml
similarity index 72%
rename from .github/ISSUE_TEMPLATE/QUESTION.yml
rename to .github/ISSUE_TEMPLATE/question.yml
index 82b27fc..bf20ef8 100644
--- a/.github/ISSUE_TEMPLATE/QUESTION.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,4 +1,4 @@
-name: "? Question"
+name: "\U00002753 Question"
 description: General questions about the container
 title: "[Question]: "
 labels: ["question"]
@@ -13,7 +13,7 @@ body:
   - type: checkboxes
     attributes:
       label: Is this a general question and not a technical issue?
-      description: For technical issues you must use the [bug report](https://github.com/qemus/qemu-arm/issues/new?assignees=&labels=bug&projects=&template=BUG_REPORT.yml&title=%5BBug%5D%3A+) form instead. It contains all the right fields (system info, logfiles, etc.) we need in order to be able to help you.
+      description: For technical issues you must use the [technical issue](https://github.com/qemus/qemu-arm/issues/new?assignees=&labels=bug&projects=&template=BUG_REPORT.yml&title=%5BBug%5D%3A+) form instead. It contains all the right fields (system info, logfiles, etc.) we need in order to be able to help you.
       options:
       - label: I am sure my question is not about a technical issue.
         required: true