diff --git a/.changeset/pink-teams-shave.md b/.changeset/pink-teams-shave.md
new file mode 100644
index 0000000..b89aae7
--- /dev/null
+++ b/.changeset/pink-teams-shave.md
@@ -0,0 +1,5 @@
+---
+"@fedimod/fires-docs": patch
+---
+
+Improve website workflows
diff --git a/.github/workflows/check-website.yml b/.github/workflows/check-website.yml
new file mode 100644
index 0000000..3e64444
--- /dev/null
+++ b/.github/workflows/check-website.yml
@@ -0,0 +1,48 @@
+name: Check Website
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/check-website.yml"
+      - "docs/**"
+      - "pnpm-lock.json"
+
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/check-website.yml"
+      - "docs/**"
+      - "pnpm-lock.json"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --filter @fedimod/fires-docs
+
+      - name: Check formatting
+        run: pnpm --filter @fedimod/fires-docs -r format:check
+
+      - name: Check build with VitePress
+        run: pnpm run --filter @fedimod/fires-docs build
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
index 72cbb20..146b98b 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -2,6 +2,12 @@ name: Deploy Website
 
 on:
   push:
+    branches:
+      - main
+    paths:
+      - ".github/workflows/deploy-website.yml"
+      - "docs/**"
+      - "pnpm-lock.json"
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
diff --git a/.github/workflows/test-server.yml b/.github/workflows/test-server.yml
index f971fcc..72b5ac0 100644
--- a/.github/workflows/test-server.yml
+++ b/.github/workflows/test-server.yml
@@ -2,11 +2,19 @@ name: Test Reference Server
 
 on:
   pull_request:
+    paths:
+      - ".github/workflows/test-server.yml"
+      - "components/fires-server/**"
+      - "pnpm-lock.json"
+      - "Dockerfile"
   push:
+    branches:
+      - main
     paths:
       - ".github/workflows/test-server.yml"
       - "components/fires-server/**"
       - "pnpm-lock.json"
+      - "Dockerfile"
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
diff --git a/docs/.vitepress/theme/custom.css b/docs/.vitepress/theme/custom.css
index f322b94..ada4808 100644
--- a/docs/.vitepress/theme/custom.css
+++ b/docs/.vitepress/theme/custom.css
@@ -661,8 +661,11 @@ p + .custom-block.warning {
   margin-top: 24px;
 }
 
-:is(.vp-external-link-icon, .vp-doc a[href*="://"], .vp-doc a[target="_blank"]):not(.no-icon)::after
-{
+:is(
+    .vp-external-link-icon,
+    .vp-doc a[href*="://"],
+    .vp-doc a[target="_blank"]
+  ):not(.no-icon)::after {
   content: "";
   color: inherit;
   transition:
@@ -670,7 +673,10 @@ p + .custom-block.warning {
     opacity 0.25s;
 }
 
-:is(.vp-external-link-icon, .vp-doc a[href*="://"], .vp-doc a[target="_blank"]):not(.no-icon):hover::after
-{
+:is(
+    .vp-external-link-icon,
+    .vp-doc a[href*="://"],
+    .vp-doc a[target="_blank"]
+  ):not(.no-icon):hover::after {
   color: inherit;
 }