diff --git a/conf.py b/conf.py
index 9e4a39a79..61b988cd6 100644
--- a/conf.py
+++ b/conf.py
@@ -231,18 +231,12 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
     'master': "Master",
+    '18.0': "Odoo 18",
     'saas-17.4': "Odoo Online",
     'saas-17.2': "Odoo Online",
-    'saas-17.1': "Odoo Online",
     '17.0': "Odoo 17",
-    'saas-16.4': "Odoo Online",
-    'saas-16.3': "Odoo Online",
-    'saas-16.2': "Odoo Online",
-    'saas-16.1': "Odoo Online",
     '16.0': "Odoo 16",
-    'saas-15.2': "Odoo Online",
     '15.0': "Odoo 15",
-    '14.0': "Odoo 14",
 }
 
 # The language names that should be shown in the language switcher, if the config option `languages`
diff --git a/content/administration/supported_versions.rst b/content/administration/supported_versions.rst
index 7d98cfd61..4fd6e307a 100644
--- a/content/administration/supported_versions.rst
+++ b/content/administration/supported_versions.rst
@@ -31,24 +31,24 @@ This matrix shows the support status of every version.
      - On-Premise
      - Release date
      - End of support
-   * - Odoo saas~17.4
+   * - **Odoo 18.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2024
+     - October 2027 (planned)
+   * - Odoo SaaS 17.4
      - |green|
      - N/A
      - N/A
      - July 2024
      -
-   * - Odoo saas~17.2
+   * - Odoo SaaS 17.2
      - |green|
      - N/A
      - N/A
      - April 2024
      -
-   * - Odoo saas~17.1
-     - |green|
-     - N/A
-     - N/A
-     - January 2024
-     -
    * - **Odoo 17.0**
      - |green|
      - |green|
@@ -60,31 +60,25 @@ This matrix shows the support status of every version.
      - |green|
      - |green|
      - October 2022
-     - November 2025 (planned)
+     - October 2025 (planned)
    * - **Odoo 15.0**
-     - |green|
-     - |green|
-     - |green|
+     - |red|
+     - |red|
+     - |red|
      - October 2021
-     - November 2024 (planned)
+     - October 2024
    * - **Odoo 14.0**
      - |red|
      - |red|
      - |red|
      - October 2020
      - November 2023
-   * - **Odoo 13.0**
-     - |red|
-     - |red|
-     - |red|
-     - October 2019
-     - October 2022
    * - Older versions
      - |red|
      - |red|
      - |red|
-     - Before 2019
-     - Before 2022
+     - Before 2020
+     - Before 2023
 
 .. admonition:: Legend