diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bd24a2e0cab5..ab64ddb3e67d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,7 +15,31 @@ pkgs/stdenv/    @edolstra
 pkgs/build-support/cc-wrapper/  @edolstra
 
 # Libraries
-lib/  @edolstra
+lib/                       @edolstra @nbp
+
+# Nixpkgs Internals
+default.nix                @nbp
+pkgs/top-level/default.nix @nbp
+pkgs/top-level/impure.nix  @nbp
+pkgs/top-level/stage.nix   @nbp
+
+# NixOS Internals
+nixos/default.nix         @nbp
+nixos/lib/from-env.nix    @nbp
+nixos/lib/eval-config.nix @nbp
+nixos/doc/manual/configuration/abstractions.xml      @nbp
+nixos/doc/manual/configuration/config-file.xml       @nbp
+nixos/doc/manual/configuration/config-syntax.xml     @nbp
+nixos/doc/manual/configuration/modularity.xml        @nbp
+nixos/doc/manual/development/assertions.xml          @nbp
+nixos/doc/manual/development/meta-attributes.xml     @nbp
+nixos/doc/manual/development/option-declarations.xml @nbp
+nixos/doc/manual/development/option-def.xml          @nbp
+nixos/doc/manual/development/option-types.xml        @nbp
+nixos/doc/manual/development/replace-modules.xml     @nbp
+nixos/doc/manual/development/writing-modules.xml     @nbp
+nixos/doc/manual/man-nixos-option.xml                @nbp
+nixos/modules/installer/tools/nixos-option.sh        @nbp
 
 # Python-related code and docs
 pkgs/top-level/python-packages.nix      @FRidh