diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2a193c166..4f67a4141 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,4 +1,4 @@
-name: Bug Report
+name: Bug report
 description: If you find a bug in Synergy, please let us know so we can fix it.
 labels: ["bug", "triage"]
 body:
@@ -23,7 +23,7 @@ body:
       description: This will help us understand the context of your issue.
       options:
         - Customer
-        - Contributor
+        - Code contributor
         - Community user
       default: 0
     validations:
@@ -41,6 +41,19 @@ body:
     validations:
       required: false
 
+  - type: dropdown
+    id: product
+    attributes:
+      label: Product name
+      description: Which Synergy product are you using?
+      options:
+        - Synergy 1
+        - Synergy 2
+        - Synergy 3
+      default: 0
+    validations:
+      required: true
+
   - type: input
     id: version
     attributes:
@@ -107,19 +120,6 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    id: product
-    attributes:
-      label: Product name
-      description: Which Synergy product are you using?
-      options:
-        - Synergy 1
-        - Synergy 2
-        - Synergy 3
-      default: 0
-    validations:
-      required: true
-
   - type: textarea
     id: logs
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 9245b2adf..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: Replace with a short title that explains your enhancement simply
-labels: enhancement, triage
-assignees: ''
-
----
-
-### Problem ###
-
-[A clear and concise description of what the problem is. ]
-
-### Solution ###
-
-[A clear and concise description of what you want to happen.]
-
-### More Info ###
-
-- Describe alternatives you've considered
-- Add any other context or screenshots about the feature request here
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..d296a129c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,120 @@
+name: Feature request
+description: Had an idea how to improve Synergy? Share it with us.
+labels: ["enhancement", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to help us improve Synergy.
+
+  - type: checkboxes
+    id: discussion
+    attributes:
+      label: Discussion
+      description: |
+        Have you considered starting a discussion instead of requesting a feature?
+      options:
+        - label: Yes, and I still want to request a feature
+          required: true
+
+  - type: dropdown
+    id: user-type
+    attributes:
+      label: What type of Synergy user are you?
+      description: This will help us understand the context of your issue.
+      options:
+        - Customer
+        - Code contributor
+        - Community user
+      default: 0
+    validations:
+      required: true
+
+  - type: input
+    id: ticket-number
+    attributes:
+      label: Support ticket number (for customers)
+      description: |
+        If you have a support ticket number, please enter it here.
+        Customers are advised to open a support ticket first: https://symless.com/synergy/contact
+        This is for customers only (non-customers please ignore this field).
+        Leave this blank if you do not have a support ticket or if you're not a customer.
+    validations:
+      required: false
+
+  - type: dropdown
+    id: product
+    attributes:
+      label: Product name
+      description: Which Synergy product are you using?
+      options:
+        - Synergy 1
+        - Synergy 2
+        - Synergy 3
+      default: 0
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: os
+    attributes:
+      label: Operating systems (OS)
+      description: Which operating systems (OS) are you using?
+      options:
+        - label: Windows
+        - label: macOS
+        - label: Linux or Unix
+        - label: Other
+    validations:
+      required: true
+
+  - type: textarea
+    id: os-version
+    attributes:
+      label: OS versions or Linux distros
+      description: |
+        Please provide the version number of your operating system (OS).
+        If you're using Linux, please provide the name of the distribution.
+      placeholder: |
+        - Windows 11
+        - macOS 15
+        - Ubuntu 24.04
+    validations:
+      required: true
+
+  - type: textarea
+    id: config
+    attributes:
+      label: Synergy configuration
+      description: |
+        Please provide a very brief description of your configuration.
+        Let us know the OS of the server/host/primary and the OS of the client/guest/secondary.
+        This will help us understand how you're using Synergy.
+      placeholder: |
+        - Windows 11 server, macOS 15 client
+        - Each computer has a single monitor
+        - Windows is on the left, macOS is on the right
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: What problem are you trying to solve?
+      description: |
+        The most important part of problem solving is understanding the problem.
+        The more detail you provide, the better we can understand your idea.
+        “If I had only one hour to save the world, 
+        I would spend fifty-five minutes defining the problem,
+        and only five minutes finding the solution.”
+        — Albert Einstein
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: What solution do you propose?
+      description: |
+        Please describe the solution you have in mind.
+    validations:
+      required: true