diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commit-lint.yml
similarity index 100%
rename from .github/workflows/commitlint.yml
rename to .github/workflows/commit-lint.yml
diff --git a/.github/workflows/depreview.yml b/.github/workflows/dep-review.yml
similarity index 100%
rename from .github/workflows/depreview.yml
rename to .github/workflows/dep-review.yml
diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-build.yml
similarity index 71%
rename from .github/workflows/docs-test.yml
rename to .github/workflows/docs-build.yml
index aad24c7b0..46f41dabf 100644
--- a/.github/workflows/docs-test.yml
+++ b/.github/workflows/docs-build.yml
@@ -1,5 +1,5 @@
 ---
-name: Test Deploy to GitHub Pages
+name: Docs Build
 
 on:
   pull_request:
@@ -7,8 +7,8 @@ on:
       - main
 
 jobs:
-  test-deploy:
-    name: Test deployment
+  build:
+    name: Test build website
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -17,7 +17,5 @@ jobs:
         uses: extractions/setup-just@v3
       - name: Fetch justfiles
         run: just fetch
-      - name: Lint the website
-        run: just docs::fmt-check
       - name: Test build website
         run: just docs::build
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs-deploy.yml
similarity index 100%
rename from .github/workflows/docs.yml
rename to .github/workflows/docs-deploy.yml
diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml
new file mode 100644
index 000000000..7db4d47c1
--- /dev/null
+++ b/.github/workflows/docs-lint.yml
@@ -0,0 +1,21 @@
+---
+name: Docs Lint
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: oven-sh/setup-bun@v2
+      - name: Install just
+        uses: extractions/setup-just@v3
+      - name: Fetch justfiles
+        run: just fetch
+      - name: Lint docs
+        run: just docs::fmt-check
diff --git a/.github/workflows/just-lint.yml b/.github/workflows/just-lint.yml
new file mode 100644
index 000000000..926ddeaed
--- /dev/null
+++ b/.github/workflows/just-lint.yml
@@ -0,0 +1,20 @@
+---
+name: Just Lint
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Install just
+        uses: extractions/setup-just@v3
+      - name: Fetch justfiles
+        run: just fetch
+      - name: Lint justfiles
+        run: just just::fmt-check
diff --git a/.github/workflows/reportcard.yml b/.github/workflows/report-card.yml
similarity index 100%
rename from .github/workflows/reportcard.yml
rename to .github/workflows/report-card.yml
diff --git a/justfile b/justfile
index 9584690bd..53cd41d36 100644
--- a/justfile
+++ b/justfile
@@ -1,8 +1,10 @@
 # Optional modules: mod? allows `just fetch` to work before .just/remote/ exists.
 # Recipes below use `just` subcommands instead of dependency syntax because just
+
 # validates dependencies at parse time, which would fail when modules aren't loaded.
 mod? go '.just/remote/go.mod.just'
 mod? docs '.just/remote/docs.mod.just'
+mod? just '.just/remote/just.mod.just'
 
 # --- Fetch ---
 
@@ -13,6 +15,8 @@ fetch:
     curl -sSfL https://raw.githubusercontent.com/osapi-io/osapi-justfiles/refs/heads/main/go.just -o .just/remote/go.just
     curl -sSfL https://raw.githubusercontent.com/osapi-io/osapi-justfiles/refs/heads/main/docs.mod.just -o .just/remote/docs.mod.just
     curl -sSfL https://raw.githubusercontent.com/osapi-io/osapi-justfiles/refs/heads/main/docs.just -o .just/remote/docs.just
+    curl -sSfL https://raw.githubusercontent.com/osapi-io/osapi-justfiles/refs/heads/main/just.mod.just -o .just/remote/just.mod.just
+    curl -sSfL https://raw.githubusercontent.com/osapi-io/osapi-justfiles/refs/heads/main/just.just -o .just/remote/just.just
 
 # --- Top-level orchestration ---
 
@@ -32,6 +36,13 @@ generate:
     just go::generate
     just docs::generate
 
+# Format, lint, and generate before committing
+ready:
+    just generate
+    just docs::fmt
+    just go::fmt
+    just go::vet
+
 [linux]
 linux-tune:
     sudo sysctl -w net.ipv4.ping_group_range="0 2147483647"