diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index afbcd7af..5d9fcd34 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -2,10 +2,16 @@ name: Bug Report
 description: Report something that's not working as expected
 title: "[Bug]: "
 labels: [ bug ]
+assignees:
+  - fibelatti
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report, helping to make the app better for everyone.
   - type: textarea
     attributes:
-      label: Describe the problem
+      label: What happened?
       description: |
         Describe what's happening to the best of your ability.
         You can also write reproduction steps if you're comfortable with it.
@@ -15,6 +21,16 @@ body:
         3. Observe that...
     validations:
       required: true
+  - type: dropdown
+    attributes:
+      label: Service
+      description: Which service are you using?
+      multiple: true
+      options:
+        - Pinboard
+        - Linkding
+    validations:
+      required: true
   - type: markdown
     attributes:
       value: |
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 60bc78b8..acf76db5 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -2,7 +2,13 @@ name: Feature Request
 description: Suggest a new feature or improvement
 title: "[Feature Request]: "
 labels: [ enhancement ]
+assignees:
+  - fibelatti
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request, helping to make the app better for everyone.
   - type: textarea
     attributes:
       label: Describe your idea
@@ -15,6 +21,16 @@ body:
       description: Try describing where and how you'd like to see your idea added to the app
     validations:
       required: true
+  - type: dropdown
+    attributes:
+      label: Service
+      description: Which service are you using?
+      multiple: true
+      options:
+        - Pinboard
+        - Linkding
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Additional context