diff --git a/.github/workflows/comment-on-asciidoc-changes.yml b/.github/workflows/comment-on-asciidoc-changes.yml
deleted file mode 100644
index 8e5f836b14..0000000000
--- a/.github/workflows/comment-on-asciidoc-changes.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Comment on PR for .asciidoc changes
-
-on:
-  # We need to use pull_request_target to be able to comment on PRs from forks
-  pull_request_target:
-    types:
-      - synchronize
-      - opened
-      - reopened
-    branches:
-      - main
-      - master
-      - "9.0"
-
-jobs:
-  comment-on-asciidoc-change:
-    permissions:
-      contents: read
-      pull-requests: write
-    uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
new file mode 100644
index 0000000000..bb466166d0
--- /dev/null
+++ b/.github/workflows/docs-build.yml
@@ -0,0 +1,19 @@
+name: docs-build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_target: ~
+  merge_group: ~
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+    with:
+      path-pattern: docs/**
+    permissions:
+      deployments: write
+      id-token: write
+      contents: read
+      pull-requests: read
diff --git a/.github/workflows/docs-cleanup.yml b/.github/workflows/docs-cleanup.yml
new file mode 100644
index 0000000000..f83e017b5f
--- /dev/null
+++ b/.github/workflows/docs-cleanup.yml
@@ -0,0 +1,14 @@
+name: docs-cleanup
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
+    permissions:
+      contents: none
+      id-token: write
+      deployments: write