diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 46f09bc19ff..00000000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# *******************************************************************************
-# Copyright (c) 2025 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Apache License Version 2.0 which is available at
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# SPDX-License-Identifier: Apache-2.0
-# *******************************************************************************
-
-name: Documentation
-
-permissions:
-  contents: write
-  pages: write
-  pull-requests: write
-  id-token: write
-
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize] # Handles forked PRs
-  push:
-    branches:
-      - main # docs are built only on push to main branch, for feature branches there are PR builds
-  merge_group:
-    types: [checks_requested]
-  release:
-    types: [created]
-
-jobs:
-  docs-build:
-    uses: eclipse-score/cicd-workflows/.github/workflows/docs.yml@829b3e11ccbf924a5782f7bfed647cb1619fdf78 # v0.0.1
-    permissions:
-      contents: write
-      pages: write
-      pull-requests: write
-      id-token: write
-    with:
-      bazel-target: "//:docs -- --github_user=${{ github.repository_owner }} --github_repo=${{ github.event.repository.name }}"
-      retention-days: 3
diff --git a/.github/workflows/on-docs.yml b/.github/workflows/on-docs.yml
new file mode 100644
index 00000000000..2fa542aba36
--- /dev/null
+++ b/.github/workflows/on-docs.yml
@@ -0,0 +1,33 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+
+name: Publish Documentation
+
+on:
+  workflow_run:
+    workflows: ["PR"]
+    types:
+      - completed
+
+concurrency:
+  group: pages-deploy
+  cancel-in-progress: false
+
+jobs:
+  docs-deploy:
+    uses: eclipse-score/cicd-workflows/.github/workflows/docs-publish.yml@dev
+    permissions:
+      pages: write
+      id-token: write
+      contents: write
+      pull-requests: write
diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml
index e4009cba6a3..9b557081a2d 100644
--- a/.github/workflows/on-pr.yml
+++ b/.github/workflows/on-pr.yml
@@ -54,3 +54,7 @@ jobs:
 
   bazel-lock:
     uses: eclipse-score/cicd-workflows/.github/workflows/bzlmod-lock-check.yml@93aac16ada7d247bbb6ae926509ddea74cf5213a # main in 2026-06-11
+
+  docs-build:
+    name: Build documentation
+    uses: eclipse-score/cicd-workflows/.github/workflows/docs.yml@dev