diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..f813977
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,20 @@
+# CODEOWNERS for sight (code-review engine)
+* @GrayCodeAI/maintainers
+
+# Engine core
+/internal/       @GrayCodeAI/core-team
+/rules/          @GrayCodeAI/core-team
+
+# API surface
+/api/            @GrayCodeAI/core-team
+/mcp/            @GrayCodeAI/core-team
+
+# CI / release / build tooling
+/.github/        @GrayCodeAI/devops-team
+/Makefile        @GrayCodeAI/devops-team
+/lefthook.yml    @GrayCodeAI/devops-team
+/scripts/        @GrayCodeAI/devops-team
+
+# Documentation
+*.md             @GrayCodeAI/docs-team
+/docs/           @GrayCodeAI/docs-team
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33f9686..56569da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,7 +109,7 @@ jobs:
             exit 1
           fi
       - name: Test
-        run: go test ./... -race -count=1 -coverprofile=coverage.out -covermode=atomic -timeout=180s
+        run: go test ./... -race -count=1 -shuffle=on -coverprofile=coverage.out -covermode=atomic -timeout=180s
       - name: Coverage summary
         run: go tool cover -func=coverage.out | tail -1
       - name: Coverage threshold