diff --git a/changes/pr-418.md b/changes/pr-418.md
new file mode 100644
index 000000000..a61a061e0
--- /dev/null
+++ b/changes/pr-418.md
@@ -0,0 +1 @@
+[mscpp] Adopt spdlog and catch2
diff --git a/flake.lock b/flake.lock
index 45c3829c2..6c7ff81fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -393,11 +393,11 @@
     "mscpp": {
       "flake": false,
       "locked": {
-        "lastModified": 1760768607,
-        "narHash": "sha256-f+h30sxSudytbX+Z9XBipR9gMFxMHjpWRNhfOGFJonY=",
+        "lastModified": 1766897832,
+        "narHash": "sha256-oMdbVcbk3pBegoKD6BQOYhTzQUXHvaxeGSbIPi4uqqE=",
         "owner": "goromal",
         "repo": "mscpp",
-        "rev": "98b27d5b0dc868eb8010be7f70d81af708403efb",
+        "rev": "62878869d06545ee6a28fc5a757159b4f8664abd",
         "type": "github"
       },
       "original": {
diff --git a/index.json b/index.json
index 8c0c3503c..ddd5d35e8 100644
--- a/index.json
+++ b/index.json
@@ -63,8 +63,8 @@
             },
             {
                 "attr": "orchestrator-cpp",
-                "ci": true,
-                "docs": true
+                "ci": false,
+                "docs": false
             },
             {
                 "attr": "ardurouter",
@@ -582,4 +582,4 @@
             "title": "Continuous OS Deployment"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/pkgs/cxx-packages/mscpp/default.nix b/pkgs/cxx-packages/mscpp/default.nix
index f930d3483..75c866c41 100644
--- a/pkgs/cxx-packages/mscpp/default.nix
+++ b/pkgs/cxx-packages/mscpp/default.nix
@@ -1,10 +1,10 @@
-{ clangStdenv, cmake, boost, pkg-src }:
+{ clangStdenv, cmake, catch2, spdlog, pkg-src }:
 clangStdenv.mkDerivation {
   name = "mscpp";
   version = "1.0.0";
   src = pkg-src;
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ boost ];
+  buildInputs = [ catch2 spdlog ];
   preConfigure = ''
     cmakeFlags="$cmakeFlags --no-warn-unused-cli"
   '';
diff --git a/pkgs/cxx-packages/orchestrator-cpp/default.nix b/pkgs/cxx-packages/orchestrator-cpp/default.nix
index 43ae8e611..e064a57d1 100644
--- a/pkgs/cxx-packages/orchestrator-cpp/default.nix
+++ b/pkgs/cxx-packages/orchestrator-cpp/default.nix
@@ -9,6 +9,7 @@ clangStdenv.mkDerivation {
     cmakeFlags="$cmakeFlags --no-warn-unused-cli"
   '';
   meta = {
+    broken = true;
     description =
       "C++ implementation of a multi-threaded job manager for my OS.";
     longDescription = ''