diff --git a/docs/add-a-site-specific-system-config.rst b/docs/add-a-site-specific-system-config.rst
index d4d3b8a1a..317c9b5a6 100644
--- a/docs/add-a-site-specific-system-config.rst
+++ b/docs/add-a-site-specific-system-config.rst
@@ -3,9 +3,9 @@
 
    SPDX-License-Identifier: Apache-2.0
 
-=============================
+======================================
 Adding a Specific System Configuration
-=============================
+======================================
 
 For a specific system, one can (optionally) add more information about the software installed on the system
 by adding Spack config files in ``benchpark/configs/$SITE/SYSTEMNAME-GENERICSYSTEM/auxiliary_software_files/``.
diff --git a/docs/add-a-system-config.rst b/docs/add-a-system-config.rst
index ecd4f9dbd..c975001d5 100644
--- a/docs/add-a-system-config.rst
+++ b/docs/add-a-system-config.rst
@@ -111,4 +111,4 @@ spack section in the `Ramble configuration file
       batch_timeout: ''
 
 If defining a specific system, one can be more specific with available software versions
-and packages, as demonstrated in :doc:`add-a-specific-system-config.rst`.
+and packages, as demonstrated in :doc:`add-a-site-specific-system-config`.
diff --git a/docs/tables/current-system-definitions.csv b/docs/tables/current-system-definitions.csv
index f4972971b..990480ba7 100644
--- a/docs/tables/current-system-definitions.csv
+++ b/docs/tables/current-system-definitions.csv
@@ -1,20 +1,20 @@
-,Magma,Sierra,Tioga,AWS_PCluster_Hpc7a-zen4-EFA,HPECray-zen3-MI250X-Slingshot,x86_64
-**site**,LLNL,LLNL,LLNL,,,
-**system**,Penguin-icelake-OmniPath,IBM-power9-V100-Infiniband,HPECray-zen3-MI250X-Slingshot,AWS_PCluster_Hpc7a-zen4-EFA,HPECray-zen3-MI250X-Slingshot,x86_64
-**integrator.vendor**,PenguinComputing,IBM,HPECray,AWS,HPECray,
-**integrator.name**,RelionCluster,AC922,EX235a,ParallelCluster3.7.2-Hpc7a,EX235a,
-**processor.vendor**,Intel,IBM,AMD,AMD,AMD,
-**processor.name**,XeonPlatinum924248C,POWER9,EPYC-Zen3,EPYC-Zen4,EPYC-Zen3,
-**processor.ISA**,x86_64,ppc64le,x86_64,x86_64,x86_64,x86_64
-**processor.uArch**,icelake,power9,zen3,zen4,zen3,
-**accelerator.vendor**,,NVIDIA,AMD,,AMD,
-**accelerator.name**,,V100,MI250X,,MI250X,
-**accelerator.ISA**,,PTX,GCN,,GCN,
-**accelerator.uArch**,,sm_70,gfx90a,,gfx90a,
-**interconnect.vendor**,Intel,Mellanox,HPECray,AWS,HPECray,
-**interconnect.name**,OmniPath,EDR-Infiniband,Slingshot11,EFA,Slingshot11,
-**system-tested.site**,LLNL,LLNL,LLNL,AWS,LLNL,
-**system-tested.name**,magma,lassen,tioga,,tioga,
-**system-tested.installation-year**,2019,2018,2022,,2022,
-**system-tested.description**,`top500 <https://www.top500.org/system/179774>`_,`top500 <https://www.top500.org/system/179398>`_,`top500 <https://www.top500.org/system/180052>`_,`aws/hpc7a <https://aws.amazon.com/ec2/instance-types/hpc7a>`_,`top500 <https://www.top500.org/system/180052>`_,
-**top500-system-instances**,Magma (LLNL),Sierra (LLNL),"Frontier (ORNL), Lumi     (CSC), Tioga    (LLNL)",,"Frontier (ORNL), Lumi     (CSC), Tioga    (LLNL)",
+,Sierra,AWS_PCluster_Hpc7a-zen4-EFA,HPECray-zen3-MI250X-Slingshot,Magma,Tioga,x86_64
+**site**,LLNL,,,LLNL,LLNL,
+**system**,IBM-power9-V100-Infiniband,AWS_PCluster_Hpc7a-zen4-EFA,HPECray-zen3-MI250X-Slingshot,Penguin-icelake-OmniPath,HPECray-zen3-MI250X-Slingshot,x86_64
+**integrator.vendor**,IBM,AWS,HPECray,PenguinComputing,HPECray,
+**integrator.name**,AC922,ParallelCluster3.7.2-Hpc7a,EX235a,RelionCluster,EX235a,
+**processor.vendor**,IBM,AMD,AMD,Intel,AMD,
+**processor.name**,POWER9,EPYC-Zen4,EPYC-Zen3,XeonPlatinum924248C,EPYC-Zen3,
+**processor.ISA**,ppc64le,x86_64,x86_64,x86_64,x86_64,x86_64
+**processor.uArch**,power9,zen4,zen3,icelake,zen3,
+**accelerator.vendor**,NVIDIA,,AMD,,AMD,
+**accelerator.name**,V100,,MI250X,,MI250X,
+**accelerator.ISA**,PTX,,GCN,,GCN,
+**accelerator.uArch**,sm_70,,gfx90a,,gfx90a,
+**interconnect.vendor**,Mellanox,AWS,HPECray,Intel,HPECray,
+**interconnect.name**,EDR-Infiniband,EFA,Slingshot11,OmniPath,Slingshot11,
+**system-tested.site**,LLNL,AWS,LLNL,LLNL,LLNL,
+**system-tested.name**,lassen,,tioga,magma,tioga,
+**system-tested.installation-year**,2018,,2022,2019,2022,
+**system-tested.description**,`top500 <https://www.top500.org/system/179398>`_,`aws/hpc7a <https://aws.amazon.com/ec2/instance-types/hpc7a>`_,`top500 <https://www.top500.org/system/180052>`_,`top500 <https://www.top500.org/system/179774>`_,`top500 <https://www.top500.org/system/180052>`_,
+**top500-system-instances**,Sierra (LLNL),,"Frontier (ORNL), Lumi     (CSC), Tioga    (LLNL)",Magma (LLNL),"Frontier (ORNL), Lumi     (CSC), Tioga    (LLNL)",