diff --git a/.github/ISSUE_TEMPLATE/1_bug.md b/.github/ISSUE_TEMPLATE/1_bug.md
deleted file mode 100644
index e12f7506..00000000
--- a/.github/ISSUE_TEMPLATE/1_bug.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: I found a problem with wger
-about: While using wger the application crashes or throws an exception, a
-  widget is buggy, or something looks wrong.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Steps to Reproduce
-
-<!-- Please include as many steps to reproduce so that we can replicate the problem. -->
-
-1. ... <!-- describe how to reproduce the problem -->
-2. ...
-3. ... 
-
-**Expected results:** <!-- what did you expect to see? -->
-
-**Actual results:** <!-- what did you see? -->
-
-<details>
-  <summary>Logs</summary>
-
-<!--
-      Any logs you think would be useful (if you have a local instance)
--->
-
-```
-```
-
-
-</details>
diff --git a/.github/ISSUE_TEMPLATE/1_bug.yml b/.github/ISSUE_TEMPLATE/1_bug.yml
new file mode 100644
index 00000000..385e5cc8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1_bug.yml
@@ -0,0 +1,53 @@
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
+# https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
+
+name: Bug report
+description: Report an error or unexpected behavior
+type: bug
+body:
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority/Impact
+      description: How severe is the issue?
+      options:
+        - Low (minor inconvenience)
+        - Medium (affects some functionality)
+        - High (critical issue, blocks workflow)
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of the bug.
+      placeholder: |
+        Please include any information you think is relevant to the issue you are experiencing.
+        This could include any steps to reproduce it (if it happens consistently), expected vs.
+        actual behavior, logs, screenshots, links to related issues, etc.
+    validations:
+      required: true
+
+  - type: input
+    id: server-version
+    attributes:
+      label: Server version
+      description: |
+        What version of wger are you using and how did you install it (you use our server,
+        docker compose, manual installation, etc)?
+      placeholder: |
+        Check https://<server>/software/about-us or the git sha1 of the last commit you pulled
+    validations:
+      required: false
+
+  - type: input
+    id: app-version
+    attributes:
+      label: Mobile app version
+      description: |
+        What version of the mobile app are you using and how did you install it
+        (Play Store, App Store, Flathub, self compiled, etc.)?
+      placeholder: |
+        Check the "about wger" dialog
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
deleted file mode 100644
index 924b1e42..00000000
--- a/.github/ISSUE_TEMPLATE/2_feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest a new idea for wger.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Use case
-
-<!--
-     Please tell us the problem you are running into that led to you wanting
-     a new feature.
-
-     Is your feature request related to a problem? Please give a clear and
-     concise description of what the problem is.
--->
-
-## Proposal
-
-<!--
-     Briefly but precisely describe what you would like wger to be able to do.
-
-     Consider attaching images showing what you are imagining.
--->
diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.yml b/.github/ISSUE_TEMPLATE/2_feature_request.yml
new file mode 100644
index 00000000..5ea0dff8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2_feature_request.yml
@@ -0,0 +1,33 @@
+name: Feature request
+description: Suggest a new idea for wger
+type: enhancement
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Use case
+      description: |
+        A description of what new feature or behavior you would like to see.
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Proposal
+      description: |
+        Why is this feature needed? What problems does it solve?
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: |
+        Any extra details, related issues, or mockups
+      placeholder: |
+        Screenshots or mockups, links to similar features in other applications, or other relevant
+        information.
+    validations:
+      required: false