diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7ba4608b..510c4b29 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.9.x
         - v0.8.x
-        - v0.7.x
-        - v0.6.x or lower
+        - v0.7.x or lower
     validations:
       required: true
   - type: dropdown
@@ -74,6 +74,7 @@ body:
         - Linux
         - Docker
         - MacOS
+        - FreeBSD
         - Windows
   - type: textarea
     id: logs
diff --git a/SECURITY.md b/SECURITY.md
index 13e6c389..eccb0dba 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.9.x   | :white_check_mark: |
 | 0.8.x   | :white_check_mark: |
-| 0.7.x   | :white_check_mark: |
-| < 0.6   | :x:                |
+| < 0.7   | :x:                |
 
 ## Reporting a Vulnerability