diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b62063f2f..53f56c5df 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
 description: Report a bug or unexpected behavior in AliasVault
-title: "[Bug]: "
+title: "[Bug] "
 labels: ["bug"]
 body:
   - type: markdown
@@ -11,7 +11,7 @@ body:
         Please fill out this form as completely as possible to help us investigate and fix the issue quickly.
 
         **Before submitting:**
-        - Search [existing issues](https://github.com/yourusername/AliasVault/issues) to avoid duplicates
+        - Search [existing issues](https://github.com/aliasvault/aliasvault/issues) to avoid duplicates
         - Make sure you're using a supported version
         - Test with the latest release if possible
 
@@ -136,25 +136,13 @@ body:
     validations:
       required: false
 
-  - type: textarea
-    id: error-message
-    attributes:
-      label: Error Messages or Logs
-      description: |
-        If you see any error messages, please copy them here.
-        For browser extension: Right-click → Inspect → Console tab
-      render: shell
-      placeholder: |
-        Paste error messages or logs here...
-    validations:
-      required: false
-
   - type: textarea
     id: additional-context
     attributes:
       label: Additional Context
       description: |
         Add any other context about the problem here:
+        - Any (technical) error messages or logs
         - Does this happen every time or intermittently?
         - Did this start after a recent update?
         - Are you using self-hosted or cloud version?
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 29f47bfa6..e3a19a883 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest a new feature or enhancement for AliasVault
-title: "[Feature Request]: "
+title: "[Feature Request] "
 labels: ["⚡️ enhancement"]
 body:
   - type: markdown
@@ -11,8 +11,8 @@ body:
         We appreciate your ideas to improve AliasVault. Please provide as much detail as possible.
 
         **Before submitting:**
-        - Search [existing feature requests](https://github.com/yourusername/AliasVault/issues?q=is%3Aissue+label%3A%22⚡️+enhancement%22) to avoid duplicates
-        - Check the [roadmap](https://github.com/yourusername/AliasVault/projects) if available
+        - Search [existing feature requests](https://github.com/aliasvault/aliasvault/issues?q=is%3Aissue%20label%3A"⚡%EF%B8%8F%20enhancement"%20state%3Aopen) to avoid duplicates
+        - Check the [v1.0 roadmap](https://github.com/aliasvault/aliasvault/issues/731)
 
   - type: checkboxes
     id: prerequisites
@@ -91,23 +91,11 @@ body:
     validations:
       required: false
 
-  - type: textarea
-    id: mockups
-    attributes:
-      label: Mockups or Examples
-      description: |
-        If applicable, add mockups, wireframes, or examples from other apps.
-        Drag and drop images here, or paste from clipboard.
-      placeholder: |
-        Drag and drop files here or paste screenshots...
-    validations:
-      required: false
-
   - type: textarea
     id: additional-context
     attributes:
       label: Additional Context
-      description: Add any other context or information about the feature request
+      description: Add any other context or information about the feature request, for example mockups, example screenshots, etc.
       placeholder: |
         This would help with...
         Similar to how [other app] does it...