diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0554c4a..6a1e7f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1143,6 +1143,13 @@ jobs:
         with:
           path: buffers-root
 
+      - name: Clone Boost.Capy
+        uses: actions/checkout@v3
+        with:
+          path: capy-root
+          repository: cppalliance/capy
+          ref: develop
+
       - name: Clone Boost
         uses: alandefreitas/cpp-actions/boost-clone@v1.9.0
         id: boost-clone
@@ -1184,7 +1191,7 @@ jobs:
 
           # Patch boost-root with workspace module
           cp -r "$workspace_root"/buffers-root "libs/$module"
-
+          cp -r "$workspace_root"/capy-root libs/capy
 
       - uses: actions/setup-node@v4
         with:
diff --git a/doc/mrdocs.yml b/doc/mrdocs.yml
index 4c83410..6790bb3 100644
--- a/doc/mrdocs.yml
+++ b/doc/mrdocs.yml
@@ -23,7 +23,7 @@ base-url: https://www.github.com/cppalliance/buffers/blob/develop/
 # Style
 verbose: true
 multipage: true
-# use-system-libc: true
-# use-system-stdlib: true
+use-system-libc: true
+use-system-stdlib: true
 
 cmake: '-DCMAKE_CXX_STANDARD=20 -DBOOST_BUFFERS_MRDOCS_BUILD=ON -DBOOST_BUFFERS_BUILD_TESTS=OFF -DBOOST_BUFFERS_BUILD_EXAMPLES=OFF'