diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5507cfcb0..4cf2259a4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Version History
 ===============
 
+v6.0.1
+------
+
+* Update CSC hierarchy by removing Archiver references and adding missing CSCs `<https://github.com/lsst-ts/LOVE-frontend/pull/642>`_
+
 v6.0.0
 ------
 
diff --git a/love/src/Config.js b/love/src/Config.js
index c015031b2..1c0e1b0f3 100644
--- a/love/src/Config.js
+++ b/love/src/Config.js
@@ -497,21 +497,21 @@ export const CSCSummaryHierarchy = {
       { name: 'ATPneumatics', salindex: 0 },
       { name: 'ATHexapod', salindex: 0 },
     ],
-    ATCalSys: [
-      { name: 'ATMonochromator', salindex: 0 },
-      { name: 'FiberSpectrograph', salindex: 0 },
-      { name: 'ATWhiteLight', salindex: 0 },
-      { name: 'Electrometer', salindex: 1 },
-      { name: 'Electrometer', salindex: 2 },
-      { name: 'LinearStage', salindex: 1 },
-      { name: 'LinearStage', salindex: 2 },
-    ],
     LATISS: [
       { name: 'ATCamera', salindex: 0 },
-      { name: 'ATArchiver', salindex: 0 },
+      { name: 'ATOODS', salindex: 0 },
       { name: 'ATHeaderService', salindex: 0 },
       { name: 'ATSpectrograph', salindex: 0 },
     ],
+    'Support & Monitoring': [{ name: 'PMD', salindex: 1 }],
+    'Calibration Systems': [
+      { name: 'ATMonochromator', salindex: 0 },
+      { name: 'FiberSpectrograph', salindex: 3 },
+      { name: 'ATWhiteLight', salindex: 0 },
+      { name: 'Electrometer', salindex: 201 },
+      { name: 'LinearStage', salindex: 1 },
+      { name: 'LinearStage', salindex: 2 },
+    ],
   },
   'Simonyi Telescope': {
     MTCS: [
@@ -526,22 +526,63 @@ export const CSCSummaryHierarchy = {
       { name: 'MTDome', salindex: 0 },
       { name: 'MTDomeTrajectory', salindex: 0 },
     ],
+    'Support & Monitoring': [
+      { name: 'MTAirCompressor', salindex: 1 },
+      { name: 'MTAirCompressor', salindex: 2 },
+      { name: 'LaserTracker', salindex: 1 },
+    ],
     ComCam: [
       { name: 'CCCamera', salindex: 0 },
-      { name: 'CCArchiver', salindex: 0 },
+      { name: 'CCOODS', salindex: 0 },
       { name: 'CCHeaderService', salindex: 0 },
     ],
+    'Star Tracker': [
+      { name: 'GenericCamera', salindex: 101 },
+      { name: 'GCHeaderService', salindex: 101 },
+      { name: 'GenericCamera', salindex: 102 },
+      { name: 'GCHeaderService', salindex: 102 },
+      { name: 'GenericCamera', salindex: 103 },
+      { name: 'GCHeaderService', salindex: 103 },
+    ],
+    'Calibration Systems': [
+      { name: 'Electrometer', salindex: 1 },
+      { name: 'TunableLaser', salindex: 0 },
+    ],
   },
   Observatory: {
     HigherLevel: [
       { name: 'ScriptQueue', salindex: 1 },
       { name: 'ScriptQueue', salindex: 2 },
+      { name: 'ScriptQueue', salindex: 3 },
+      { name: 'Scheduler', salindex: 1 },
+      { name: 'Scheduler', salindex: 2 },
+      { name: 'Scheduler', salindex: 3 },
       { name: 'Watcher', salindex: 0 },
+      { name: 'OCPS', salindex: 1 },
+      { name: 'OCPS', salindex: 2 },
+      { name: 'GIS', salindex: 2 },
     ],
     Environment: [
       { name: 'DIMM', salindex: 1 },
       { name: 'DIMM', salindex: 2 },
       { name: 'WeatherStation', salindex: 1 },
+      { name: 'WeatherForecast', salindex: 0 },
+      { name: 'HVAC', salindex: 0 },
+      { name: 'ESS', salindex: 1 },
+      { name: 'ESS', salindex: 101 },
+      { name: 'ESS', salindex: 102 },
+      { name: 'ESS', salindex: 103 },
+      { name: 'ESS', salindex: 104 },
+      { name: 'ESS', salindex: 105 },
+      { name: 'ESS', salindex: 106 },
+      { name: 'ESS', salindex: 107 },
+      { name: 'ESS', salindex: 108 },
+      { name: 'ESS', salindex: 201 },
+      { name: 'ESS', salindex: 202 },
+      { name: 'ESS', salindex: 203 },
+      { name: 'ESS', salindex: 204 },
+      { name: 'ESS', salindex: 205 },
+      { name: 'ESS', salindex: 301 },
     ],
   },
 };
@@ -562,7 +603,7 @@ export const defaultCSCList = [
   { name: 'LinearStage', salindex: 1 },
   { name: 'LinearStage', salindex: 2 },
   { name: 'ATCamera', salindex: 0 },
-  { name: 'ATArchiver', salindex: 0 },
+  { name: 'ATOODS', salindex: 0 },
   { name: 'ATHeaderService', salindex: 0 },
   { name: 'ATSpectrograph', salindex: 0 },
   { name: 'MTMount', salindex: 0 },
@@ -576,7 +617,7 @@ export const defaultCSCList = [
   { name: 'MTDome', salindex: 0 },
   { name: 'MTDomeTrajectory', salindex: 0 },
   { name: 'CCCamera', salindex: 0 },
-  { name: 'CCArchiver', salindex: 0 },
+  { name: 'CCOODS', salindex: 0 },
   { name: 'CCHeaderService', salindex: 0 },
   { name: 'ScriptQueue', salindex: 1 },
   { name: 'ScriptQueue', salindex: 2 },