diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 7e18e25d770..6789142f97f 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -2,6 +2,7 @@ name: Docs
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened, closed]
     branches: [main, release/*, feature/*]
   push:
     branches: [main]
@@ -14,11 +15,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: true
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
-  contents: read
-  pages: write
-  id-token: write
+  contents: write       # push to gh-pages branch
+  pull-requests: write  # post/update preview URL comment on PRs
 
 jobs:
   build-docs:
@@ -30,18 +29,44 @@ jobs:
       - name: Build docs
         run: pip install tox && tox -e build-docs
       - name: Upload docs artifact
-        if: github.event_name == 'push'
-        uses: actions/upload-pages-artifact@v4
+        if: github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+        uses: actions/upload-artifact@v4
         with:
+          name: docs-html
           path: docs/build/html
 
+  deploy-preview:
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    # Per-PR concurrency without cancel-in-progress so 'closed' cleanup always runs
+    concurrency:
+      group: pr-preview-${{ github.event.pull_request.number }}
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/ubuntu-setup
+      - name: Build docs
+        if: github.event.action != 'closed'
+        run: pip install tox && tox -e build-docs
+      - name: Deploy / remove PR preview
+        uses: rossjrw/pr-preview-action@v1
+        with:
+          source-dir: docs/build/html
+
   deploy-gh-pages:
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     needs: build-docs
     runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - id: deployment
-        uses: actions/deploy-pages@v4
+      - uses: actions/checkout@v6
+      - name: Download docs artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: docs-html
+          path: docs/build/html
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: docs/build/html
+          # Preserve PR preview subdirectories deployed by the deploy-preview job
+          clean-exclude: pr-preview