diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d17deffa..1547124e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -354,10 +354,18 @@ jobs:
           trace-commands: true
 
   antora:
-    name: Antora Docs
     needs: [ runner-selection ]
-    runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)['ubuntu-latest'] }}
-    container: ubuntu:23.10
+    strategy:
+      matrix:
+        include:
+          - { name: Windows, os: windows-latest }
+          - { name: Ubuntu, os: ubuntu-latest }
+          - { name: MacOS, os: macos-latest }
+    name: Antora Docs (${{ matrix.name }})
+    runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
+    defaults:
+      run:
+        shell: bash
     steps:
       - name: Install packages
         uses: alandefreitas/cpp-actions/package-install@v1.8.7
@@ -380,14 +388,13 @@ jobs:
         with:
           node-version: 18
 
-      - name: Setup C++
-        uses: alandefreitas/cpp-actions/setup-cpp@v1.8.7
-        id: setup-cpp
-        with:
-          compiler: clang
-          version: 18
+      - name: Setup Ninja
+        if: runner.os == 'Windows'
+        uses: seanmiddleditch/gha-setup-ninja@v5
 
       - name: Build Antora Docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config --global --add safe.directory "$(pwd)"
           
@@ -408,6 +415,6 @@ jobs:
       - name: Create Antora Docs Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: antora-docs
+          name: antora-docs-${{ matrix.name }}
           path: doc/build/site
           
diff --git a/doc/local-playbook.yml b/doc/local-playbook.yml
index 7dff20e6a..d6c9a0863 100644
--- a/doc/local-playbook.yml
+++ b/doc/local-playbook.yml
@@ -33,11 +33,11 @@ antora:
   extensions:
     - require: '@antora/lunr-extension' # https://gitlab.com/antora/antora-lunr-extension
       index_latest_only: true
-    - require: '@alandefreitas/antora-cpp-tagfiles-extension'
+    - require: '@cppalliance/antora-cpp-tagfiles-extension'
       cpp-tagfiles:
         using-namespaces:
           - 'boost::'
-    - require: '@alandefreitas/antora-cpp-reference-extension'
+    - require: '@cppalliance/antora-cpp-reference-extension'
       dependencies:
         - name: 'boost'
           repo: 'https://github.com/boostorg/boost.git'
@@ -50,5 +50,5 @@ asciidoc:
     # Enable pagination
     page-pagination: ''
   extensions:
-    - '@alandefreitas/asciidoctor-boost-links'
+    - '@cppalliance/asciidoctor-boost-links'
     - '@asciidoctor/tabs'
diff --git a/doc/package-lock.json b/doc/package-lock.json
index 667a3eb19..9dd6bbb07 100644
--- a/doc/package-lock.json
+++ b/doc/package-lock.json
@@ -5,12 +5,12 @@
   "packages": {
     "": {
       "dependencies": {
-        "@alandefreitas/antora-cpp-reference-extension": "^0.0.3",
-        "@alandefreitas/antora-cpp-tagfiles-extension": "^0.0.3",
-        "@alandefreitas/asciidoctor-boost-links": "^0.0.1",
         "@antora/expand-path-helper": "^2.0.0",
         "@antora/lunr-extension": "^1.0.0-alpha.8",
-        "@asciidoctor/tabs": "^1.0.0-beta.3"
+        "@asciidoctor/tabs": "^1.0.0-beta.3",
+        "@cppalliance/antora-cpp-reference-extension": "^0.0.5",
+        "@cppalliance/antora-cpp-tagfiles-extension": "^0.0.4",
+        "@cppalliance/asciidoctor-boost-links": "^0.0.2"
       },
       "devDependencies": {
         "@antora/cli": "3.1.3",
@@ -18,36 +18,6 @@
         "antora": "3.1.3"
       }
     },
-    "node_modules/@alandefreitas/antora-cpp-reference-extension": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@alandefreitas/antora-cpp-reference-extension/-/antora-cpp-reference-extension-0.0.3.tgz",
-      "integrity": "sha512-tgshdhPzjlfBaRG11jACMH9R4apAogTHAP2Y57qTj9m1YzeZqABNTRwor7uTCgB27bGLnWM73tT8EqguBEJ+yQ==",
-      "dependencies": {
-        "@antora/expand-path-helper": "^2.0.0",
-        "axios": "^1.7.2",
-        "cache-directory": "^2.0.0",
-        "fast-glob": "^3.3.2",
-        "isomorphic-git": "^1.27.1",
-        "js-yaml": "^4.1.0"
-      }
-    },
-    "node_modules/@alandefreitas/antora-cpp-tagfiles-extension": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@alandefreitas/antora-cpp-tagfiles-extension/-/antora-cpp-tagfiles-extension-0.0.3.tgz",
-      "integrity": "sha512-BfIJuZaT8K0v2wNnGdGVjPhBZEjAwUaDJnkXtKYzDoPaY4WpsnVyqTuGxFyvZGr+jtpqPfh81l2x7SXFo9UOHg==",
-      "dependencies": {
-        "@antora/expand-path-helper": "^2.0.0",
-        "cache-directory": "^2.0.0",
-        "fast-xml-parser": "^4.4.1",
-        "he": "^1.2.0",
-        "isomorphic-git": "^1.27.1"
-      }
-    },
-    "node_modules/@alandefreitas/asciidoctor-boost-links": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@alandefreitas/asciidoctor-boost-links/-/asciidoctor-boost-links-0.0.1.tgz",
-      "integrity": "sha512-qrtRYDKTcifTbDg7uOv/bz3Sbnn8dHyLziOgyCqDDk2m0QpSS4wqkxeE4eVZCmPmWlLHrmwD0v+WnUCi5OQwRg=="
-    },
     "node_modules/@antora/asciidoc-loader": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.1.3.tgz",
@@ -371,6 +341,36 @@
         "node": ">=16.0.0"
       }
     },
+    "node_modules/@cppalliance/antora-cpp-reference-extension": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-reference-extension/-/antora-cpp-reference-extension-0.0.5.tgz",
+      "integrity": "sha512-wSJgtb6FF/s3n9ex7HT7dFHimzaLLvkcNsy0CtL74chOGnAXbQlmuK5Jfw0BvgkdBtaazekgRC4lh/Gktw2aFw==",
+      "dependencies": {
+        "@antora/expand-path-helper": "^2.0.0",
+        "axios": "^1.7.2",
+        "cache-directory": "^2.0.0",
+        "fast-glob": "^3.3.2",
+        "isomorphic-git": "^1.27.1",
+        "js-yaml": "^4.1.0"
+      }
+    },
+    "node_modules/@cppalliance/antora-cpp-tagfiles-extension": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@cppalliance/antora-cpp-tagfiles-extension/-/antora-cpp-tagfiles-extension-0.0.4.tgz",
+      "integrity": "sha512-dzb/QDZ+a5yk7vaEb2jNQ5p02XjA6LfPmLRWcxqb/MvpA9DHZKsPunFDy+yqY3eGy9zqNppunljy9TZUbeoczg==",
+      "dependencies": {
+        "@antora/expand-path-helper": "^2.0.0",
+        "cache-directory": "^2.0.0",
+        "fast-xml-parser": "^4.4.1",
+        "he": "^1.2.0",
+        "isomorphic-git": "^1.27.1"
+      }
+    },
+    "node_modules/@cppalliance/asciidoctor-boost-links": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@cppalliance/asciidoctor-boost-links/-/asciidoctor-boost-links-0.0.2.tgz",
+      "integrity": "sha512-9Lg1s955QeBO/xosbJbd+P4qJo1CkC0MvkiAIDZoqf10g8KQpMNy88NBAWji5YcNwXcrr8KP83GEweKMNDBMsw=="
+    },
     "node_modules/@iarna/toml": {
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
diff --git a/doc/package.json b/doc/package.json
index 13467da0a..f2e9937e9 100644
--- a/doc/package.json
+++ b/doc/package.json
@@ -5,9 +5,9 @@
     "antora": "3.1.3"
   },
   "dependencies": {
-    "@alandefreitas/antora-cpp-reference-extension": "^0.0.3",
-    "@alandefreitas/antora-cpp-tagfiles-extension": "^0.0.3",
-    "@alandefreitas/asciidoctor-boost-links": "^0.0.1",
+    "@cppalliance/antora-cpp-reference-extension": "^0.0.5",
+    "@cppalliance/antora-cpp-tagfiles-extension": "^0.0.4",
+    "@cppalliance/asciidoctor-boost-links": "^0.0.2",
     "@antora/expand-path-helper": "^2.0.0",
     "@antora/lunr-extension": "^1.0.0-alpha.8",
     "@asciidoctor/tabs": "^1.0.0-beta.3"