diff --git a/CODEOWNERS b/CODEOWNERS
index 8330f02500..524ca88404 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -38,8 +38,20 @@
 *.go @fleetdm/go
 go.sum @fleetdm/go
 go.mod @fleetdm/go
-/server/ @fleetdm/go
 /cmd/ @fleetdm/go
+/orbit/ @lucasmrod @getvictor @roperzh @gillespi314
+/server/ @fleetdm/go
+/server/service/handler.go @lucasmrod @getvictor @roperzh @gillespi314
+/server/mdm/ @roperzh @gillespi314
+/server/worker/ @lucasmrod @getvictor @roperzh @gillespi314
+/server/vulnerabilities/ @lucasmrod @mostlikelee
+/server/cron/ @getvictor @lucasmrod
+/ee/fleetd-chrome @lucasmrod @getvictor
+/ee/vulnerability-dashboard @eashaw
+/ee/cis @sharon-fdm @lucasmrod
+/ee/server/calender @lucasmrod @getvictor
+/ee/server/service @roperzh @gillespi314 @lucasmrod @getvictor
+/scripts/mdm @roperzh @gillespi314
 
 ##############################################################################################
 # 🚀 React files and other files related to the core product frontend.
diff --git a/handbook/engineering/README.md b/handbook/engineering/README.md
index e7d7335f81..4d4515dc5c 100644
--- a/handbook/engineering/README.md
+++ b/handbook/engineering/README.md
@@ -281,6 +281,13 @@ Check the "📃 Planned articles" column in [#g-demand board](https://app.zenhub
     - [Sharpie Fine Point Markers](https://www.everythingbranded.com/product/sharpie-fine-point-332908)
     - [Custom sticky note pads](https://www.everythingbranded.com/product/custom-sticky-notes-585601) (design is in the StickerMule [brand kit](https://www.stickermule.com/studio/brand-kits))
 
+### Review another product group's pull request
+Some code paths require pull request review from multiple product groups to confirm there are no
+unintended side effects of the change for another product group. All code paths defined in
+[CODEOWNERS](https://github.com/fleetdm/fleet/blob/main/CODEOWNERS) that are assigned to individual
+engineers across multiple product groups must be approved by one engineer from each product group
+before merging.
+
 ### Review a community pull request
 If you're assigned a community pull request for review, it is important to keep things moving for the contributor. The goal is to not go more than one business day without following up with the contributor.