diff --git a/backend/endpoints/tests/test_heartbeat.py b/backend/endpoints/tests/test_heartbeat.py
index 9a8a802c8..d67860b10 100644
--- a/backend/endpoints/tests/test_heartbeat.py
+++ b/backend/endpoints/tests/test_heartbeat.py
@@ -8,14 +8,32 @@ client = TestClient(app)
 def test_heartbeat():
     response = client.get("/heartbeat")
     assert response.status_code == 200
+    print(response.json())
     assert response.json() == {
-        'ROMM_AUTH_ENABLED': True,
-        'ENABLE_RESCAN_ON_FILESYSTEM_CHANGE': True,
-        'ENABLE_SCHEDULED_RESCAN': True,
-        'ENABLE_SCHEDULED_UPDATE_SWITCH_TITLEDB': True,
-        'ENABLE_SCHEDULED_UPDATE_MAME_XML': True,
-        'RESCAN_ON_FILESYSTEM_CHANGE_DELAY': 5,
-        'SCHEDULED_RESCAN_CRON': '0 3 * * *',
-        'SCHEDULED_UPDATE_SWITCH_TITLEDB_CRON': '0 4 * * *',
-        'SCHEDULED_UPDATE_MAME_XML_CRON': '0 5 * * *',
+        "ROMM_AUTH_ENABLED": True,
+        "WATCHER": {
+            "ENABLED": True,
+            "TITLE": "Rescan on filesystem change",
+            "MESSAGE": "Runs a scan when a change is detected in the library path, with a 5 minutes delay",
+        },
+        "SCHEDULER": {
+            "RESCAN": {
+                "ENABLED": True,
+                "CRON": "0 3 * * *",
+                "TITLE": "Scheduled rescan",
+                "MESSAGE": "Rescans the entire library",
+            },
+            "SWITCH_TITLEDB": {
+                "ENABLED": True,
+                "CRON": "0 4 * * *",
+                "TITLE": "Scheduled Switch TitleDB update",
+                "MESSAGE": "Updates the Nintedo Switch TitleDB file",
+            },
+            "MAME_XML": {
+                "ENABLED": True,
+                "CRON": "0 5 * * *",
+                "TITLE": "Scheduled MAME XML update",
+                "MESSAGE": "Updates the Nintedo MAME XML file",
+            },
+        },
     }
diff --git a/backend/main.py b/backend/main.py
index 5b33c4bf4..448487f5d 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -81,8 +81,7 @@ def heartbeat():
         "WATCHER": {
             "ENABLED": ENABLE_RESCAN_ON_FILESYSTEM_CHANGE,
             "TITLE": "Rescan on filesystem change",
-            "MESSAGE": f"Runs a scan when a change is detected in the library path, \
-                with a {RESCAN_ON_FILESYSTEM_CHANGE_DELAY} minutes delay",
+            "MESSAGE": f"Runs a scan when a change is detected in the library path, with a {RESCAN_ON_FILESYSTEM_CHANGE_DELAY} minutes delay",
         },
         "SCHEDULER": {
             "RESCAN": {