diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8c25c757fca3..ed54c4ee3bfe 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -336,3 +336,8 @@ nixos/tests/zfs.nix                       @raitobezarius
 
 # Linux Kernel
 pkgs/os-specific/linux/kernel/manual-config.nix   @amjoseph-nixpkgs
+
+# Buildbot
+nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
+nixos/tests/buildbot.nix                               @Mic92 @zowoq
+pkgs/development/tools/continuous-integration/buildbot @Mic92 @zowoq