diff --git a/include/branches.csv b/include/branches.csv
new file mode 100644
index 0000000000..565f0e25e6
--- /dev/null
+++ b/include/branches.csv
@@ -0,0 +1,7 @@
+Branch,Schedule,Status,First release,End-of-life,Release manager
+main,:pep:`693`,features,*2023-10-02*,*2028-10*,Thomas Wouters
+3.11,:pep:`664`,bugfix,2022-10-24,*2027-10*,Pablo Galindo Salgado
+3.10,:pep:`619`,bugfix,2021-10-04,*2026-10*,Pablo Galindo Salgado
+3.9,:pep:`596`,security,2020-10-05,*2025-10*,Łukasz Langa
+3.8,:pep:`569`,security,2019-10-14,*2024-10*,Łukasz Langa
+3.7,:pep:`537`,security,2018-06-27,*2023-06-27*,Ned Deily
diff --git a/include/end-of-life.csv b/include/end-of-life.csv
new file mode 100644
index 0000000000..44bb3cc16b
--- /dev/null
+++ b/include/end-of-life.csv
@@ -0,0 +1,10 @@
+Branch,Schedule,Status,First release,End-of-life,Release manager
+3.6,:pep:`494`,end-of-life,2016-12-23,2021-12-23,Ned Deily
+3.5,:pep:`478`,end-of-life,2015-09-13,2020-09-30,Larry Hastings
+3.4,:pep:`429`,end-of-life,2014-03-16,2019-03-18,Larry Hastings
+3.3,:pep:`398`,end-of-life,2012-09-29,2017-09-29,"Georg Brandl, Ned Deily (3.3.7+)"
+3.2,:pep:`392`,end-of-life,2011-02-20,2016-02-20,Georg Brandl
+3.1,:pep:`375`,end-of-life,2009-06-27,2012-04-09,Benjamin Peterson
+3.0,:pep:`361`,end-of-life,2008-12-03,2009-06-27,Barry Warsaw
+2.7,:pep:`373`,end-of-life,2010-07-03,2020-01-01,Benjamin Peterson
+2.6,:pep:`361`,end-of-life,2008-10-01,2013-10-29,Barry Warsaw
diff --git a/versions.rst b/versions.rst
index 6c7da26c34..c4e1b049f3 100644
--- a/versions.rst
+++ b/versions.rst
@@ -15,37 +15,24 @@ Supported Versions
 
 Dates shown in *italic* are scheduled and can be adjusted.
 
-====== ========== ======== ============= ============ =====================
-Branch Schedule   Status   First release End-of-life  Release manager
-====== ========== ======== ============= ============ =====================
-main   :pep:`693` features *2023-10-03*  *2028-10*    Thomas Wouters
-3.11   :pep:`664` bugfix   2022-10-24    *2027-10*    Pablo Galindo Salgado
-3.10   :pep:`619` bugfix   2021-10-04    *2026-10*    Pablo Galindo Salgado
-3.9    :pep:`596` security 2020-10-05    *2025-10*    Łukasz Langa
-3.8    :pep:`569` security 2019-10-14    *2024-10*    Łukasz Langa
-3.7    :pep:`537` security 2018-06-27    *2023-06-27* Ned Deily
-====== ========== ======== ============= ============ =====================
+.. csv-table::
+   :header-rows: 1
+   :widths: 5, 5, 15, 15, 12, 40
+   :file: include/branches.csv
 
+.. Remember to update main branch in the paragraph above too
 
-Unsupported versions
+
+Unsupported Versions
 ====================
 
-====== ========== =========== ============= =========== ================================
-Branch Schedule   Status      First release End-of-life  Release manager
-====== ========== =========== ============= =========== ================================
-3.6    :pep:`494` end-of-life 2016-12-23    2021-12-23  Ned Deily
-3.5    :pep:`478` end-of-life 2015-09-13    2020-09-30  Larry Hastings
-3.4    :pep:`429` end-of-life 2014-03-16    2019-03-18  Larry Hastings
-3.3    :pep:`398` end-of-life 2012-09-29    2017-09-29  Georg Brandl, Ned Deily (3.3.7+)
-3.2    :pep:`392` end-of-life 2011-02-20    2016-02-20  Georg Brandl
-3.1    :pep:`375` end-of-life 2009-06-27    2012-04-09  Benjamin Peterson
-3.0    :pep:`361` end-of-life 2008-12-03    2009-06-27  Barry Warsaw
-2.7    :pep:`373` end-of-life 2010-07-03    2020-01-01  Benjamin Peterson
-2.6    :pep:`361` end-of-life 2008-10-01    2013-10-29  Barry Warsaw
-====== ========== =========== ============= =========== ================================
+.. csv-table::
+   :header-rows: 1
+   :widths: 5, 5, 15, 15, 12, 40
+   :file: include/end-of-life.csv
 
 
-Status key
+Status Key
 ==========
 
 :features: new features, bugfixes, and security fixes are accepted.