diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 1f580f164a..da8f80300d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -6,6 +6,10 @@ on:
     paths:
       - "docs/**"
       - ".github/workflows/docs.yml"
+  pull_request:
+    paths:
+      - "docs/**"
+      - ".github/workflows/docs.yml"
   workflow_dispatch: # Allow manual triggering
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -59,14 +63,24 @@ jobs:
         run: cd docs && mdbook build
 
       - name: Copy CNAME to build output
-        run: cp docs/CNAME docs/book/CNAME
+        run: |
+          cp docs/CNAME docs/book/html/CNAME
+          echo "✅ CNAME file copied to docs/book/html/"
+          cat docs/book/html/CNAME
+          echo ""
+          echo "📦 Files in build output (docs/book/html/):"
+          ls -la docs/book/html/ | head -20
+          echo ""
+          echo "🔍 Checking for index.html:"
+          ls -lh docs/book/html/index.html
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: ./docs/book
+          path: ./docs/book/html
 
   deploy:
+    if: github.event_name != 'pull_request'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
diff --git a/scripts/wait_pr_checks.sh b/scripts/wait_pr_checks.sh
index f8ae2e7b5f..4db3f6ca10 100755
--- a/scripts/wait_pr_checks.sh
+++ b/scripts/wait_pr_checks.sh
@@ -15,13 +15,21 @@ echo ""
 
 while true; do
   # Get PR status
-  STATUS=$(gh pr view "$PR_NUMBER" --json mergeable,mergeStateStatus 2>/dev/null || echo "error")
+  STATUS=$(gh pr view "$PR_NUMBER" --json mergeable,mergeStateStatus,state 2>/dev/null || echo "error")
   
   if [ "$STATUS" = "error" ]; then
     echo "❌ Failed to get PR status. Does PR #$PR_NUMBER exist?"
     exit 1
   fi
   
+  PR_STATE=$(echo "$STATUS" | jq -r '.state')
+  
+  # Check if PR is already merged
+  if [ "$PR_STATE" = "MERGED" ]; then
+    echo "✅ PR #$PR_NUMBER has been merged!"
+    exit 0
+  fi
+  
   MERGEABLE=$(echo "$STATUS" | jq -r '.mergeable')
   MERGE_STATE=$(echo "$STATUS" | jq -r '.mergeStateStatus')