diff --git a/.coderabbit.yml b/.coderabbit.yml
index d8f345f..6bcdebe 100644
--- a/.coderabbit.yml
+++ b/.coderabbit.yml
@@ -2,12 +2,42 @@ language: en-US
 
 reviews:
   enabled: true
+  profile: assertive
   auto_review:
     enabled: true
     drafts: false
+    auto_incremental_review: true
     base_branches:
       - main
       - develop
+      - feature/.*
+      - fix/.*
+  request_changes_workflow: true
+  high_level_summary: true
+  collapse_walkthrough: true
+  assess_linked_issues: true
+  related_issues: true
+  related_prs: true
+  path_filters:
+    - "!node_modules/**"
+    - "!vendor/**"
+    - "!assets/css/*.map"
+  finishing_touches:
+    autofix:
+      enabled: true
+    docstrings:
+      enabled: true
+    unit_tests:
+      enabled: true
+  tools:
+    eslint:
+      enabled: true
+    markdownlint:
+      enabled: true
+    gitleaks:
+      enabled: true
+    trufflehog:
+      enabled: true
   path_instructions:
     - path: "theme.json"
       instructions: |
@@ -111,5 +141,13 @@ reviews:
     - Check that placeholder tokens have been replaced (if not a starter)
     - Check for consistent text domain usage
 
+knowledge_base:
+  code_guidelines:
+    enabled: true
+    filePatterns:
+      - "AGENTS.md"
+  learnings:
+    scope: auto
+
 chat:
   enabled: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a0903..823c3c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [Unreleased] — Expand CodeRabbit config for full auto-review and finishing touches (LS-4124)
+
+### Changed
+
+- `.coderabbit.yml`: corrected `auto_review.base_branches` to use the `feature/.*` and `fix/.*` regular expressions, so stacked PRs (based on a prior feature or fix branch rather than `main`/`develop`) trigger an automatic review. Enabled `auto_incremental_review`, `assess_linked_issues`, `related_issues`, `related_prs`, `path_filters`, `finishing_touches` (autofix/docstrings/unit_tests), `tools` (eslint/markdownlint/gitleaks/trufflehog), and `knowledge_base.code_guidelines` (pointed at `AGENTS.md`). Set `profile: assertive` and enabled `request_changes_workflow`. ([#57](https://github.com/lightspeedwp/ls-theme/pull/57))
+
+---
+
 ## [Unreleased] — Build Search template (LS-2594)
 
 ### Added