diff --git a/_includes/table.html b/_includes/table.html
index 2eb00b9e82dc..fbaece399e3f 100644
--- a/_includes/table.html
+++ b/_includes/table.html
@@ -23,6 +23,11 @@
                  see https://jekyllrb.com/docs/liquid/filters/#date-to-string.
          - timeago: display the value using the timeago filter,
                  see https://github.com/markets/jekyll-timeago.
+         - end-date: display the value as an end of something date (such as support or EOL).
+                 This is the "classic" way do display end of support or EOL date on endoflife.date, with:
+                 - a background color as a visual indication,
+                 - the value displayed using both the date_to_string and timeago filters,
+                 - a support for both boolean and date values.
 {% endcomment %}
 {%- assign labels = include.labels | split:',' %}
 {%- assign fields = include.fields | split:',' %}
@@ -38,10 +43,29 @@
 {%- for row in rows %}
     <tr>
   {%- for field in fields %}
-    {%- if types[forloop.index0] == "date" %}
-      <td>{{ row[field] | date_to_string }}</td>
-    {%- elsif types[forloop.index0] == "timeago" %}
-      <td>{{ row[field] | timeago }}</td>
+    {%- assign type = types[forloop.index0] %}
+    {%- assign value = row[field] %}
+    {%- if type == "date" %}
+      <td>{{ value | date_to_string }}</td>
+    {%- elsif type == "timeago" %}
+      <td>{{ value | timeago }}</td>
+    {%- elsif type == "end-date" %}
+      {%- if value == true %}
+      <td class="bg-green-000">Yes</td>
+      {%- elsif value == false %}
+      <td class="bg-red-000">No</td>
+      {%- else %}
+        {%- assign row_date = row[field] | date: '%s' %}
+        {%- assign site_date = site.time | date: '%s' %}
+        {%- assign days_between = row_date | minus: site_date | divided_by: 86400 %}
+        {%- if days_between < 0 %}
+      <td class="bg-red-000">Ended {{ row[field] | timeago }} <div>({{ row[field] | date_to_string }})</div></td>
+        {%- elsif days_between < 120 %}
+      <td class="bg-yellow-200">Ends {{ row[field] | timeago }} <div>({{ row[field] | date_to_string }})</div></td>
+        {%- else %}
+      <td class="bg-green-000">Ends {{ row[field] | timeago }} <div>({{ row[field] | date_to_string }})</div></td>
+        {%- endif %}
+      {%- endif %}
     {%- else %}
       <td>{{ row[field] }}</td>
     {%- endif %}
diff --git a/products/vmware-esxi.md b/products/vmware-esxi.md
index d30f694a2bf2..0d4d0a98e1fb 100644
--- a/products/vmware-esxi.md
+++ b/products/vmware-esxi.md
@@ -87,5 +87,5 @@ support, server/client/guest OS updates, new security patches or bug fixes unles
 {% include table.html
 labels="Release,Technical Guidance Ends"
 fields="releaseCycle,technicalGuidance"
-types="raw,timeago"
+types="raw,end-date"
 rows=page.releases %}
diff --git a/products/vmware-horizon.md b/products/vmware-horizon.md
index c4781458f031..e722dd1fee12 100644
--- a/products/vmware-horizon.md
+++ b/products/vmware-horizon.md
@@ -125,5 +125,5 @@ support, server/client/guest OS updates, new security patches or bug fixes unles
 {% include table.html
    labels="Release,Technical Guidance Ends"
    fields="releaseCycle,technicalGuidance"
-   types="raw,timeago"
+   types="raw,end-date"
    rows=page.releases %}
diff --git a/products/vmware-srm.md b/products/vmware-srm.md
index 66a4b0a3bdcb..f271abd59dda 100644
--- a/products/vmware-srm.md
+++ b/products/vmware-srm.md
@@ -132,5 +132,5 @@ support, server/client/guest OS updates, new security patches or bug fixes unles
 {% include table.html
 labels="Release,Technical Guidance Ends"
 fields="releaseCycle,technicalGuidance"
-types="raw,timeago"
+types="raw,end-date"
 rows=page.releases %}
diff --git a/products/vmware-vcenter.md b/products/vmware-vcenter.md
index fca0d3c88faf..cdcf9834cb51 100644
--- a/products/vmware-vcenter.md
+++ b/products/vmware-vcenter.md
@@ -109,5 +109,5 @@ support, server/client/guest OS updates, new security patches or bug fixes unles
 {% include table.html
 labels="Release,Technical Guidance Ends"
 fields="releaseCycle,technicalGuidance"
-types="raw,timeago"
+types="raw,end-date"
 rows=page.releases %}