diff --git a/.github/DISCUSSION_TEMPLATE/questions.yml b/.github/DISCUSSION_TEMPLATE/questions.yml
index e9b796947..9e24cffc1 100644
--- a/.github/DISCUSSION_TEMPLATE/questions.yml
+++ b/.github/DISCUSSION_TEMPLATE/questions.yml
@@ -4,13 +4,37 @@ body:
       label: Question
     validations:
       required: true
-  - type: input
+  - type: dropdown
     attributes:
-      label: Vico version(s)
+      label: Module(s)
+      description: >
+        Leave this empty only if the question doesn’t concern a specific module or a set thereof.
+      multiple: true
+      options:
+        - compose
+        - compose-m2
+        - compose-m3
+        - multiplatform
+        - views
   - type: dropdown
     attributes:
-      label: UI framework(s)
+      label: Platform(s)
+      description: >
+        Leave this empty only if the question doesn’t concern a specific platform or a set thereof.
       multiple: true
       options:
-        - Jetpack Compose
-        - Views
+        - Android
+        - iOS
+  - type: input
+    attributes:
+      label: Platform version(s)
+      description: >
+        Leave this empty only if the question doesn’t concern a specific platform version or a set
+        thereof.
+  - type: input
+    attributes:
+      label: Vico version(s)
+      description: >
+        Support is provided only for versions released within the last year; for older versions,
+        update Vico first. Leave this empty only if the question doesn’t concern a specific version
+        or a set thereof.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 2d9f5839b..92269b6c8 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -2,10 +2,17 @@ name: Bug
 description: Report incorrect behavior.
 labels: ["bug"]
 body:
+  - type: textarea
+    attributes:
+      label: Example
+      description: >
+        Provide either a minimal reproducible example or the name of an affected sample chart.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: How to reproduce
-      description: Please provide a detailed description of how to reproduce the bug.
+      description: Describe how to reproduce the bug using the example.
     validations:
       required: true
   - type: textarea
@@ -20,17 +27,39 @@ body:
       required: true
   - type: dropdown
     attributes:
-      label: Vico version(s)
-      description: If you’re using an outdated version, please try updating Vico first.
+      label: Module(s)
       multiple: true
       options:
-        - 2.0.0
-        - 1.16.1
+        - compose
+        - compose-m2
+        - compose-m3
+        - multiplatform
+        - views
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Platform(s)
+      multiple: true
+      options:
+        - Android
+        - iOS
     validations:
       required: true
   - type: input
     attributes:
-      label: Android version(s)
+      label: Platform version(s)
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Vico version(s)
+      description: For outdated versions, try updating Vico first.
+      multiple: true
+      options:
+        - 2.0.1
+        - 2.1.0-alpha.2
+        - 1.16.1
     validations:
       required: true
   - type: textarea