diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 510c4b29..7171ae20 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -31,9 +31,9 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
+        - v0.10.x
         - v0.9.x
-        - v0.8.x
-        - v0.7.x or lower
+        - v0.8.x or lower
     validations:
       required: true
   - type: dropdown
diff --git a/SECURITY.md b/SECURITY.md
index eccb0dba..13f83f8a 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,9 +6,9 @@ We provide security updates for the following versions of Stalwart Mail Server:
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 0.10.x   | :white_check_mark: |
 | 0.9.x   | :white_check_mark: |
-| 0.8.x   | :white_check_mark: |
-| < 0.7   | :x:                |
+| < 0.8   | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/UPGRADING.md b/UPGRADING.md
index 2e2fcba7..8cace27b 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -3,7 +3,8 @@ Upgrading from `v0.9.x` to `v0.10.0`
 
 ## Important Notes
 
-- Version `0.10.0` introduces roles and permissions, changing how principals (accounts, groups, lists, etc.) are stored in the database.
+- In version `0.10.0` accounts are associated with roles and permissions, which define what resources they can access. The concept of administrator or super user accounts no longer exists, now there is a single account type (the `individual` principal) which can be assigned the `admin` role or custom permissions to have administrator access.
+- Due to the changes in the database layout in order to support roles and permissions, the database must be migrated to the new layout. The migration is automatic and should not require any manual intervention.
 - While the database migration is automatic, it's recommended to **back up your data** before upgrading.
 - The webadmin must be upgraded **before** the mail server to maintain access post-upgrade.