diff --git a/_layouts/product.html b/_layouts/product.html
index 9e1b781e051..8787587af45 100644
--- a/_layouts/product.html
+++ b/_layouts/product.html
@@ -152,8 +152,8 @@ <h1>{{ page.title }}</h1>
   </tr>
 {% endfor %}
 {% assign can_be_hidden_releases_count = page.releases | where: 'can_be_hidden', true | size %}
-{% if can_be_hidden_releases_count > 0 %}
-  <tr id="show-more-row" class="d-none">
+{% if can_be_hidden_releases_count > 0 and page.omitUnmaintainedReleasesButton != true %}
+<tr id="show-more-row" class="d-none">
     <td colspan="{{ colCount }}" class="text-center">
       <button id="show-hidden-releases-button" class="btn">
         Show more unmaintained releases
diff --git a/products/spring-framework.md b/products/spring-framework.md
index 2cbb3d51b2e..27b5e9d6bea 100644
--- a/products/spring-framework.md
+++ b/products/spring-framework.md
@@ -1,7 +1,7 @@
 ---
 title: Spring Framework
 category: framework
-tags: java-runtime vmware
+tags: java-runtime vmware herodevs
 iconSlug: spring
 permalink: /spring-framework
 alternate_urls:
@@ -11,6 +11,7 @@ changelogTemplate: https://github.com/spring-projects/spring-framework/releases/
 releaseDateColumn: true
 eolColumn: OSS support
 eoesColumn: Commercial Support
+omitUnmaintainedReleasesButton: true
 
 auto:
   methods:
@@ -35,7 +36,7 @@ releases:
     supportedJakartaEEVersions: "9 - 10"
     releaseDate: 2023-11-16
     eol: 2025-08-31
-    eoes: 2026-12-31
+    eoes: 2028-12-31
     latest: "6.1.14"
     latestReleaseDate: 2024-10-17
 
@@ -44,7 +45,7 @@ releases:
     supportedJakartaEEVersions: "9 - 10"
     releaseDate: 2022-11-16
     eol: 2024-08-31
-    eoes: 2025-12-31
+    eoes: 2027-12-31
     latest: "6.0.23"
     latestReleaseDate: 2024-08-14
 
@@ -53,7 +54,7 @@ releases:
     supportedJakartaEEVersions: "7 - 8"
     releaseDate: 2020-10-27
     eol: 2024-08-31
-    eoes: 2026-12-31
+    eoes: 2036-12-31
     lts: true
     latest: "5.3.39"
     latestReleaseDate: 2024-08-14
@@ -83,6 +84,7 @@ releases:
     supportedJakartaEEVersions: "N/A"
     releaseDate: 2017-09-28
     eol: 2020-12-31
+    eoes: 2020-12-31
     link: https://github.com/spring-projects/spring-framework/releases/tag/v__LATEST__.RELEASE
     latest: "5.0.20"
     latestReleaseDate: 2020-12-09
@@ -92,6 +94,7 @@ releases:
     supportedJakartaEEVersions: "N/A"
     releaseDate: 2016-06-10
     eol: 2020-12-31
+    eoes: 2036-12-31
     link: https://github.com/spring-projects/spring-framework/releases/tag/v__LATEST__.RELEASE
     latest: "4.3.30"
     latestReleaseDate: 2020-12-09
@@ -111,12 +114,44 @@ releases:
 > programming and configuration model for modern Java-based enterprise applications - on any kind of
 > deployment platform.
 
-See [Spring Boot Milestones page](https://github.com/spring-projects/spring-framework/milestones)
-for upcoming releases and [Spring Boot Support page](https://spring.io/projects/spring-framework#support)
+See [Spring Framework Milestones page](https://github.com/spring-projects/spring-framework/milestones)
+for upcoming releases and [Spring Framework Support page](https://spring.io/projects/spring-framework#support)
 for more details about support roadmap.
 
-Extended support is available
-[from VMWare](https://tanzu.vmware.com/content/blog/vmware-spring-runtime-extended-support).
+Commercial support is available from
+[VMWare](https://tanzu.vmware.com/content/blog/vmware-spring-runtime-extended-support) and [HeroDevs NES](https://www.herodevs.com/support/spring-nes).
+
+<table class="lifecycle">
+    <thead>
+        <tr>
+            <th style="width: 100pt;">Version</th>
+            <th style="width: 220pt;">VMWare</th>
+            <th style="width: 220pt;">HeroDevs</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>6.1</td>
+            <td class="bg-green-000"><a href="https://blogs.vmware.com/tanzu">Ends on 31 Dec 2026</a></td>
+            <td class="bg-green-000"><a href="https://www.herodevs.com/support/spring-nes">Ends on 31 Dec 2028</a></td>
+        </tr>
+        <tr>
+            <td>6.0</td>
+            <td class="bg-green-000"><a href="https://blogs.vmware.com/tanzu">Ends on 31 Dec 2026</a></td>
+            <td class="bg-green-000"><a href="https://www.herodevs.com/support/spring-nes">Ends on 31 Dec 2027</a></td>
+        </tr>
+        <tr>
+            <td>5.3</td>
+            <td class="bg-green-000"><a href="https://blogs.vmware.com/tanzu">Ends on 31 Dec 2026</a></td>
+            <td class="bg-green-000"><a href="https://www.herodevs.com/support/spring-nes">Ends on 31 Dec 2036</a></td>
+        </tr>
+        <tr>
+            <td>4.3</td>
+            <td class="bg-red-000"><a href="https://blogs.vmware.com/tanzu">Ended 31 Dec 2022</a></td>
+            <td class="bg-green-000"><a href="https://www.herodevs.com/support/spring-nes">Ends on 31 Dec 2036</a></td>
+        </tr>
+    </tbody>
+</table>
 
 ## [JDK/Jakarta EE Compatibility](https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-Versions#jdk-version-range)
 
@@ -124,4 +159,4 @@ Extended support is available
   labels="Release,JDK,Jakarta EE"
   fields="releaseCycle,supportedJavaVersions,supportedJakartaEEVersions"
   types="string,string"
-  rows=page.releases %}
+  rows=page.releases %}
\ No newline at end of file