diff --git a/.github/issues-auto-comments.yml b/.github/issues-auto-comments.yml
index a8274e818..f73c2d2a3 100644
--- a/.github/issues-auto-comments.yml
+++ b/.github/issues-auto-comments.yml
@@ -1,5 +1,5 @@
 comment:
-  footer: |
+  footer: >
     ---
     > I am a bot, and this is an automated message 🤖
 labels:
@@ -8,7 +8,7 @@ labels:
       issue:
         action: close
         body: >
-          Hello @{{ issue.user.login }} your ticket has been marked as invalid.
+          Hello @{{ issue.user.login }}. Your ticket has been marked as invalid.
           Please ensure you follow the issue template, provide all requested info,
           and be sure to check the docs + previous issues prior to raising tickets.
 
@@ -16,31 +16,42 @@ labels:
     labeled:
       issue:
         body: >
-          This issue has been marked as a good first issue for first-time contributors to implement!
-          This is a great way to support the project, while also improving your skills, you'll also be credited as a contributor once your PR is merged.
-          If you're new to SillyTavern [here are a collection of resources](https://docs.sillytavern.app/)
-          If you need any support at all, feel free to reach out via [Discord](https://discord.gg/sillytavern).
+          This issue has been marked as a good first issue for contributors to implement!
+          This is a great way to support the project. While also improving your skills, you'll also be credited as a contributor once your PR is merged.
+          If you're new to SillyTavern [here is the official documentation](https://docs.sillytavern.app/). The official contribution guide can be found [here](https://github.com/SillyTavern/SillyTavern/blob/release/CONTRIBUTING.md).
+          If you need any support at all, feel free to reach out via [Discord](https://discord.gg/sillytavern), or let us know in this issue or via [discussions](https://github.com/SillyTavern/SillyTavern/discussions).
 
   - name: ❌ wontfix
     labeled:
       issue:
         action: close
         body: >
-          This ticked has been marked as 'wontfix', which usually means it is out-of-scope, or not feasible at this time.
-          You can still fork the project and make the changes yourself.
+          This ticket has been marked as 'wontfix', which usually means it is out-of-scope, or not feasible at this time.
+          IF you have any questions about this, feel free to reach out.
 
-  - name: ✅ Fixed
+  - name: ✅ Done (staging)
     labeled:
       issue:
         body: >
-          Hello @{{ issue.user.login }}! It looks like all or part of this issue has now been implemented.
+          It looks like all or part of this issue has now been implemented as part of the `staging` branch.
+          If you currently are on the `release` branch, you can switch to `staging` to test this right away.
+
+          Note that `staging` is considered less stable than the official releases. To switch, follow existing instructions,
+          or simply enter the following command: `git switch staging`
+
+  - name: ✅ Done
+    labeled:
+      issue:
+        body: >
+          It looks like all or part of this issue has now been implemented as part of the `latest` release.
 
   - name: ‼️ High Priority
     labeled:
       issue:
         body: >
-          This ticket has been marked as high priority, and has been bumped to the top of the priority list.
-          You should expect an implementation to be pushed out soon. Thank you for your patience.
+            This issue has been marked as high priority, indicating that it is important to the maintainers and the community.
+            While we cannot guarantee an immediate fix or provide an exact timeline, please rest assured that it is on our radar and will be addressed whenever possible.
+            Thank you for your patience and understanding.
 
   - name: 💀 Spam
     labeled:
@@ -49,5 +60,5 @@ labels:
         locking: lock
         lock_reason: spam
         body: >
-           This issue has been identified as spam, and is now locked.
-           Users who repeatedly
+          This issue has been identified as spam, and is now locked.
+          Please refrain from posting spam in the future, as it disrupts the community and wastes valuable time.
diff --git a/.github/pr-auto-comments.yml b/.github/pr-auto-comments.yml
index 0e4e9fe93..be935b098 100644
--- a/.github/pr-auto-comments.yml
+++ b/.github/pr-auto-comments.yml
@@ -1,15 +1,39 @@
 comment:
-  footer: |
+  footer: >
     ---
     > I am a bot, and this is an automated message 🤖
 labels:
   - name: ✖️ Invalid
     labeled:
       pr:
-        body: Thank you @{{ pull_request.user.login }} for suggesting this. Please follow the pull request templates.
         action: close
+        body: >
+          Thank you @{{ pull_request.user.login }} for contributing to this repository.
+          Your Pull Request has been marked as invalid.
+
+          Please ensure you follow the pull request template, provide all relevant info,
+          and target the correct branch. `staging` is the default target branch, `release` should only be targeted for important hotfixes.
+
+          If you have any questions, feel free to reach out.
 
   - name: ⛔ Don't Merge
     labeled:
       pr:
-        body: This PR has been temporarily blocked from merging.
+        body: >
+          This PR has been temporarily blocked from merging.
+
+  - name: 💥💣 Breaking Changes
+    labeled:
+      pr:
+        body: >
+          This PR is marked as containing one or more breaking changes.
+
+          Please make sure that those are documented accordingly and steps to inform users at release are prepared.
+
+  - name: ⛔ Waiting For External/Upstream
+    labeled:
+      pr:
+        body: >
+            This PR is awaiting external or upstream changes or approval.
+            It can only be merged once those changes have been implemented and approved.
+            Please inform us of any progress on the upstream changes or approval.