diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c5dc9d910c53..2405f7d4efa9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,18 +10,19 @@
 # This file
 /.github/CODEOWNERS @edolstra
 
-# Boostraping and core infra
-/pkgs/stdenv                    @edolstra
-/pkgs/build-support/cc-wrapper  @edolstra
-
 # Libraries
 /lib                        @edolstra @nbp
+/lib/systems                @edolstra @nbp @ericson2314
 
 # Nixpkgs Internals
-/default.nix                @nbp
-/pkgs/top-level/default.nix @nbp
-/pkgs/top-level/impure.nix  @nbp
-/pkgs/top-level/stage.nix   @nbp
+/default.nix                          @nbp
+/pkgs/top-level/default.nix           @nbp @Ericson2314
+/pkgs/top-level/impure.nix            @nbp @Ericson2314
+/pkgs/top-level/stage.nix             @nbp @Ericson2314
+/pkgs/stdenv                          @edolstra
+/pkgs/build-support/cc-wrapper        @edolstra @Ericson2314
+/pkgs/build-support/bintools-wrapper  @edolstra @Ericson2314
+/pkgs/build-support/setup-hooks       @edolstra @Ericson2314
 
 # NixOS Internals
 /nixos/default.nix          @nbp