mattermost · amyblais · Apr 16, 2026 · Apr 16, 2026 · Apr 17, 2026 · Apr 20, 2026
diff --git a/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst b/source/administration-guide/upgrade/prepare-to-upgrade-mattermost.rst
@@ -58,7 +58,7 @@ We strongly recommend that you:
 - Upgrade your instance of Mattermost to the latest :doc:`Extended Support Release (ESR) </product-overview/mattermost-server-releases>` first before attempting to run the Mattermost v6.0 upgrade.
 
 .. important::
-  Support for Mattermost Server v10.5 :doc:`Extended Support Release </product-overview/mattermost-server-releases>` has come to the end of its life cycle on November 15, 2025. Upgrading to Mattermost Server v10.11 Extended Support Release or later is required. Upgrading from the previous Extended Support Release to the latest Extended Support Release is supported. Review the :doc:`important-upgrade-notes` for all intermediate versions in between to ensure you’re aware of the possible migrations that could affect your upgrade.
+  Support for Mattermost Server v10.11 :doc:`Extended Support Release </product-overview/mattermost-server-releases>` is coming to the end of its life cycle on August 15, 2026. Upgrading to Mattermost Server v11.7 Extended Support Release or later is recommended. Upgrading from the previous Extended Support Release to the latest Extended Support Release is supported. Review the :doc:`important-upgrade-notes` for all intermediate versions in between to ensure you’re aware of the possible migrations that could affect your upgrade.
 
 v6.0 database schema migrations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/source/conf.py b/source/conf.py
@@ -526,9 +526,9 @@ def setup(app: Sphinx):
 # built documents.
 #
 # The short X.Y version.
-# version = '11.6'
+# version = '11.7'
 # The full version, including alpha/beta/rc tags.
-# release = '11.6'
+# release = '11.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/source/product-overview/common-esr-support-rst.rst b/source/product-overview/common-esr-support-rst.rst
@@ -1,3 +1,3 @@
 .. important::
 
-   Support for Mattermost Server v10.5 :ref:`Extended Support Release <product-overview/release-policy:extended support releases>` has come to the end of its life cycle on November 15, 2025. Upgrading to :doc:`Mattermost Server v10.11 or later </product-overview/mattermost-server-releases>` is required.
+   Support for Mattermost Server v10.11 :ref:`Extended Support Release <product-overview/release-policy:extended support releases>` is coming to the end of its life cycle on August 15, 2026. Upgrading to :doc:`Mattermost Server v11.7 or later </product-overview/mattermost-server-releases>` is recommended.
diff --git a/source/product-overview/common-esr-support-upgrade.md b/source/product-overview/common-esr-support-upgrade.md
@@ -1,7 +1,7 @@
 <!-- Snippet include; not intended to be a standalone page -->
 
-- Support for Mattermost Server v10.5 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2025. Upgrading to Mattermost Server v10.11 or later is required.
-- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.5 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-5-extended-support-release) or the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release).
+- Support for Mattermost Server v10.11 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) is coming to the end of its life cycle on August 15, 2026. Upgrading to Mattermost Server v11.7 or later is recommended.
+- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or the [v11.7 ESR](https://docs.mattermost.com/product-overview/mattermost-server-releases.html).
 - See the [Important Upgrade Notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html) documentation for details on upgrading to a newer release.
 - See the [changelog in progress](https://bit.ly/2nK3cVf) for details about the upcoming release.
-- All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software.
+- All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software.
diff --git a/source/product-overview/common-esr-support.md b/source/product-overview/common-esr-support.md
@@ -1,4 +1,4 @@
 <!-- Snippet include; not intended to be a standalone page -->
 
-- Support for Mattermost Server v10.5 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) has come to the end of its life cycle on November 15, 2025. Upgrading to [Mattermost Server v10.11](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or later is required.
+- Support for Mattermost Server v10.11 [Extended Support Release](https://docs.mattermost.com/product-overview/release-policy.html#extended-support-releases) is coming to the end of its life cycle on August 15, 2026. Upgrading to [Mattermost Server v11.7](https://docs.mattermost.com/product-overview/mattermost-server-releases.html) or later is recommended.
 - All Mattermost users must accept Mattermost's [Acceptable Use Policy](https://mattermost.com/terms-of-use/#acceptable-use-policy) and [Privacy Policy](https://mattermost.com/privacy-policy/) when creating an account or accessing Mattermost. For customers with a Mattermost subscription, including self-hosted deployments, organizations may replace or override the Acceptable Use Policy in the [Mattermost System Console](https://docs.mattermost.com/administration-guide/configure/site-configuration-settings.html#terms-of-use-link) with their own acceptable use or conduct policies, based on contractual terms with Mattermost, so long as your own terms either incorporate the Acceptable Use Policy or include equivalent terms. If you change the default link to add your own terms for using the service you provide, your new terms must include a link to the default terms so end users are aware of the Mattermost Acceptable Use Policy for Mattermost software.
diff --git a/source/product-overview/release-policy.md b/source/product-overview/release-policy.md
@@ -58,7 +58,7 @@ gantt
     v11.4                  :active, 2026-02-16, 2026-05-15
     v11.5                  :active, 2026-03-16, 2026-06-15
     v11.6                  :active, 2026-04-16, 2026-07-15
-    v11.7 & Desktop App v6.2 Extended Support :crit,    2026-05-16, 2027-05-15
+    v11.7 & Desktop App v6.2 Extended Support :crit,    2026-05-15, 2027-05-15
 ```
 
 **Timeline Legend:**
@@ -83,7 +83,7 @@ The following table lists all releases across Mattermost v7.0, v8.0, and v9.0, i
 
 ```{Important}
 - If you're on a legacy Mattermost release prior to v7.1, in order to take advantage of newer Mattermost releases, you must upgrade to [v7.1 ESR](https://docs.mattermost.com/product-overview/unsupported-legacy-releases.html#release-v7-1-extended-support-release) at a minimum.
-- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.5 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-5-extended-support-release) or the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release).
+- Upgrading from one Extended Support Release (ESR) to the next ESR (``major`` -> ``major_next``) is fully supported and tested. However, upgrading across multiple ESR versions (``major`` to ``major+2``) is supported, but not tested. If you plan to skip versions, we strongly recommend upgrading only between ESR releases. For example, if you're upgrading from v8.1 ESR, upgrade to the v9.5 ESR or the v9.11 ESR before attempting to upgrade to the [v10.11 ESR](https://docs.mattermost.com/product-overview/mattermost-v10-changelog.html#release-v10-11-extended-support-release) or the [v11.7 ESR](https://docs.mattermost.com/product-overview/mattermost-server-releases.html).
 ```
 
 | **Release** | **Release Type** | **Support ended** |