diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT_FORM.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 80%
rename from .github/ISSUE_TEMPLATE/BUG_REPORT_FORM.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
index 74b17228a..6070ad3fd 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT_FORM.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,12 +1,16 @@
 name: Bug Report
 description: Use this template to report a bug or issue.
-title: "[Bug] "
-labels: ["bug", "needs review"]
+title: "[Question] "
+labels: ["question", "needs review"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report! You should only use this form for issues, to request a change or feature use the [feature request form](https://github.com/alexjustesen/speedtest-tracker).
+        Thanks for taking the time to report this issue! We appreciate your help in improving the project. If this report is confirmed as a bug, we’ll update its type accordingly.
+
+        Please note:  
+        - For **feature requests or changes**, use the [feature request form](https://github.com/alexjustesen/speedtest-tracker/issues/new?template=feature_request.yml).  
+        - For **general questions**, **setup or configuration help**, or if you’re not sure this is a bug, please use **[GitHub Discussions](https://github.com/alexjustesen/speedtest-tracker/discussions)** instead.
   - type: checkboxes
     attributes:
       label: Pre-work
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST_FORM.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/FEATURE_REQUEST_FORM.yml
rename to .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/workflows/stale_issues.yml b/.github/workflows/stale_issues.yml
index 4289db4df..eb16a7e77 100644
--- a/.github/workflows/stale_issues.yml
+++ b/.github/workflows/stale_issues.yml
@@ -1,14 +1,8 @@
 name: Close Stale Issues
 
 on:
-  # Runs daily at 10:00 AM UTC
   schedule:
-    - cron: '0 10 * * *'
-  # Runs at issue comment
-  issue_comment:
-    types: [created]
-
-  # Allow manual trigger
+    - cron: '0 10 * * *'  # Runs daily at 10:00 AM UTC
   workflow_dispatch:
 
 jobs:
@@ -20,26 +14,37 @@ jobs:
         uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          
-          # Issue-specific configuration
+
+          # Only apply to issues, not PRs
+          only-issues: true
+
+          # Stale messaging
           stale-issue-message: >
             👋 This issue has been automatically marked as stale due to inactivity.
             If this issue is still relevant, please comment to keep it open.
             Without activity, it will be closed in 7 days.
-          
-          close-issue-message: > 
+
+          close-issue-message: >
             🔒 This issue has been automatically closed due to prolonged inactivity.
             Feel free to reopen if the issue is still valid.
-          
-          # More nuanced staleness criteria
-          days-before-issue-stale: 7        # Mark as stale after 7 days of inactivity
-          days-before-issue-close: 7         # Close 7 days after being marked stale
-          
-          # More specific labeling
+
+          # Timing
+          days-before-issue-stale: 7
+          days-before-issue-close: 7
+
+          # Label management
           stale-issue-label: 'no-issue-activity'
           close-issue-label: 'closed-no-issue-activity'
-          
-          # Refined issue selection, Only issues with both bug and question label
-          only-issue-labels: 'bug, question'
+          remove-stale-when-updated: true
+
+          # Targeting only `question`-labeled issues
+          only-issue-labels: 'question'
+          exempt-issue-labels: >
+            bug, chore, confirmed, dependencies, help wanted,
+            documentation, duplicate, feature, good first issue,
+            needs review, wontfix
+
+          # Skip assigned or milestone-tracked issues
+          exempt-assignees: true
+          exempt-milestones: true
 
-# Issues will be closed as "Not Planned" by default.