diff --git a/_data/centos/distributions.yml b/_data/centos/distributions.yml
index 71aae8f..e72e0c1 100644
--- a/_data/centos/distributions.yml
+++ b/_data/centos/distributions.yml
@@ -50,8 +50,10 @@
           release_email: https://lists.centos.org/pipermail/centos-announce/2020-November/035820.html
           website: https://docs.centos.org/
       eol:
-        - overview: ""
-          date: "30 June 2024"
+        - overview: >
+            2024-06-30
+            (end of <a href="https://access.redhat.com/support/policy/updates/errata#Life_Cycle_Dates">RHEL 7 Maintenance Support 2 Phase</a>)
+          date: ""
           url: ""
 
 - name: "CentOS Stream"
@@ -89,10 +91,9 @@
           release_email: "https://lists.centos.org/pipermail/centos-announce/2021-December/060971.html"
           website: "https://docs.centos.org/en-US/docs/"
       eol:
-        - overview: |
-            End of RHEL9 <a
-            href="https://access.redhat.com/support/policy/updates/errata#Full_Support_Phase">full
-            support</a> phase.
+        - overview: >
+            2027-05-31
+            (end of <a href="https://access.redhat.com/support/policy/updates/errata#Life_Cycle_Dates">RHEL 9 Full Support Phase</a>)
           date: ""
           url: ""
     8:
@@ -120,8 +121,10 @@
           release_email: "https://lists.centos.org/pipermail/centos-announce/2019-September/023449.html"
           website: "https://docs.centos.org/"
       eol:
-        - overview: ""
-          date: "31 May 2024"
+        - overview: >
+            2024-05-31
+            (end of <a href="https://access.redhat.com/support/policy/updates/errata#Life_Cycle_Dates">RHEL 8 Full Support Phase</a>)
+          date: ""
           url: ""
       convert:
         - overview: "Converting from CentOS Linux 8 to CentOS Stream 8"
diff --git a/cl-vs-cs.md b/cl-vs-cs.md
index ac07176..29c44b4 100644
--- a/cl-vs-cs.md
+++ b/cl-vs-cs.md
@@ -18,7 +18,7 @@ As [announced in December of 2020](https://blog.centos.org/2020/12/future-is-cen
 * CentOS Linux 7 EOL: 2024-06-30
 * CentOS Linux 8 EOL: 2021-12-31
 * CentOS Stream 8 EOL: 2024-05-31
-* CentOS Stream 9 EOL: estimated 2027, dependent on RHEL9 end of "Full Support Phase"
+* CentOS Stream 9 EOL: 2027-05-31
 
 ## Upstream vs downstream