diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index d22f5a442..696c244ff 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -20,13 +20,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - run: npm i asciidoctor-kroki
-      - name: Build Antora Site
-        uses: philips-forks/antora-site-action@ef15f74e055960099ec1bf58f4f8148d1f07a0c2
+      - uses: philips-software/antora-site-action@3540c48165a9ac1620a2cb57f52cafb06f779aa8 # 1.1.0
         with:
           antora_playbook: antora-playbook-site.yml
-          antora_generator: "antora-site-generator-lunr"
-          antora_docsearch_enabled: "true"
       - name: Store Antora Site
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
@@ -48,13 +44,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-      - run: npm i asciidoctor-kroki
-      - name: Build Antora Site
-        uses: philips-forks/antora-site-action@ef15f74e055960099ec1bf58f4f8148d1f07a0c2
+      - uses: philips-software/antora-site-action@3540c48165a9ac1620a2cb57f52cafb06f779aa8 # 1.1.0
         with:
           antora_playbook: antora-playbook-branch.yml
-          antora_generator: "antora-site-generator-lunr"
-          antora_docsearch_enabled: "true"
       - name: Store Antora Site
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
diff --git a/antora-playbook-branch.yml b/antora-playbook-branch.yml
index f8428ef7c..2220bdaec 100644
--- a/antora-playbook-branch.yml
+++ b/antora-playbook-branch.yml
@@ -12,7 +12,10 @@ ui:
   bundle:
     url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable
     snapshot: true
-  supplemental_files: ./documents/supplemental-ui
+  supplemental_files: documents/supplemental-ui
+antora:
+  extensions:
+    - require: "@antora/lunr-extension"
 asciidoc:
   attributes:
     kroki-fetch-diagram: true
diff --git a/antora-playbook-site.yml b/antora-playbook-site.yml
index 7845e779d..ee698b3ba 100644
--- a/antora-playbook-site.yml
+++ b/antora-playbook-site.yml
@@ -12,7 +12,10 @@ ui:
   bundle:
     url: https://gitlab.com/antora/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable
     snapshot: true
-  supplemental_files: ./documents/supplemental-ui
+  supplemental_files: documents/supplemental-ui
+antora:
+  extensions:
+    - require: "@antora/lunr-extension"
 asciidoc:
   attributes:
     kroki-fetch-diagram: true
diff --git a/documents/modules/ROOT/pages/Echo.adoc b/documents/modules/ROOT/pages/Echo.adoc
index 6391444f1..ff497852d 100644
--- a/documents/modules/ROOT/pages/Echo.adoc
+++ b/documents/modules/ROOT/pages/Echo.adoc
@@ -164,9 +164,9 @@ decoding the individual message.
 All files should be ordered in the following manner:
 
 1.  Syntax
-1.  Imports (sorted)
-1.  Package
-1.  Everything else
+2.  Imports (sorted)
+3.  Package
+4.  Everything else
 
 === Naming
 
diff --git a/documents/modules/ROOT/pages/Sesame.adoc b/documents/modules/ROOT/pages/Sesame.adoc
index b5a320718..3c47edd42 100644
--- a/documents/modules/ROOT/pages/Sesame.adoc
+++ b/documents/modules/ROOT/pages/Sesame.adoc
@@ -212,5 +212,5 @@ COBS -> Windowed : ReleaseWindow\n03 07 00
 
 [source,protobuf]
 ----
-include::SesameSecurity.proto[]
+include::example$SesameSecurity.proto[]
 ----