diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0372a1e8..d56b5ee6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,15 +1,30 @@
-# Default CODEOWNERS for Sensible Analytics repositories
+# Sensible Analytics CODEOWNERS
+# ================================
 
-# Global fallback - all files
-* @Sensible-Analytics/engineering
+# Default: Senior Engineers (Lead Team)
+*                   @Sensible-Analytics/lead
 
-# Organization-level files
-.github/ @Sensible-Analytics/engineering
-CODEOWNERS @Sensible-Analytics/engineering
-LICENSE @Sensible-Analytics/engineering
-SECURITY.md @Sensible-Analytics/engineering
+# Frontend (React/TypeScript)
+src/web/            @Sensible-Analytics/frontend
+src/components/    @Sensible-Analytics/frontend
+frontend/          @Sensible-Analytics/frontend
+*.tsx              @Sensible-Analytics/frontend
 
-# Documentation
-README.md @Sensible-Analytics/engineering
-CONTRIBUTING.md @Sensible-Analytics/engineering
-CODE_OF_CONDUCT.md @Sensible-Analytics/engineering
+# Backend (Rust)
+src-tauri/         @Sensible-Analytics/backend
+src/               @Sensible-Analytics/backend
+Cargo.toml         @Sensible-Analytics/backend
+Cargo.lock         @Sensible-Analytics/backend
+
+# Infrastructure
+src/infrastructure/  @Sensible-Analytics/devops
+terraform/            @Sensible-Analytics/devops
+docker-compose.yml   @Sensible-Analytics/devops
+
+# Security
+src/auth/           @Sensible-Analytics/security
+src/payment/        @Sensible-Analytics/security
+
+# GitHub configs (keep last)
+.github/           @Sensible-Analytics/lead
+CODEOWNERS         @Sensible-Analytics/lead