diff --git a/docs/community-builder.md b/docs/community-builder.md
index d572921..38e561c 100644
--- a/docs/community-builder.md
+++ b/docs/community-builder.md
@@ -4,7 +4,7 @@ We provide an `x86_64-linux` build machine as a public remote builder for the ni
 
 #### Access
 
-If you want access read the security guide lines on [aarch64-build-box](https://github.com/nix-community/aarch64-build-box). Than add your username to [`builder/users.nix`](https://github.com/nix-community/infra/blob/master/modules/nixos/builder/users.nix). Don't keep any important data in your home! We will regularly delete `/home` without further notice.
+If you want access read the security guide lines on [aarch64-build-box](https://github.com/nix-community/aarch64-build-box). Than add your username to [`builder/users.nix`](https://github.com/nix-community/infra/blob/master/modules/nixos/community-builder/users.nix). Don't keep any important data in your home! We will regularly delete `/home` without further notice.
 
 #### Using your NixOS home-manager configuration on the hosts
 
diff --git a/flake.nix b/flake.nix
index 82a7d5c..e589823 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,7 +128,7 @@
         flake.nixosModules = {
           common = ./modules/nixos/common.nix;
 
-          builder = ./modules/nixos/builder;
+          community-builder = ./modules/nixos/community-builder;
           hercules-ci = ./modules/nixos/hercules-ci;
           hydra = ./modules/nixos/hydra;
           nur-update = ./modules/nixos/nur-update;
diff --git a/hosts/build01/configuration.nix b/hosts/build01/configuration.nix
index bb482ca..bb4b5ca 100644
--- a/hosts/build01/configuration.nix
+++ b/hosts/build01/configuration.nix
@@ -15,7 +15,7 @@
     inputs.self.nixosModules.common
     inputs.self.nixosModules.raid
     inputs.self.nixosModules.zfs
-    inputs.self.nixosModules.builder
+    inputs.self.nixosModules.community-builder
     inputs.self.nixosModules.remote-builder-aarch64-nixos-community
   ];
 
diff --git a/modules/nixos/builder/default.nix b/modules/nixos/community-builder/default.nix
similarity index 100%
rename from modules/nixos/builder/default.nix
rename to modules/nixos/community-builder/default.nix
diff --git a/modules/nixos/builder/keys/0x4A6F b/modules/nixos/community-builder/keys/0x4A6F
similarity index 100%
rename from modules/nixos/builder/keys/0x4A6F
rename to modules/nixos/community-builder/keys/0x4A6F
diff --git a/modules/nixos/builder/keys/a-kenji b/modules/nixos/community-builder/keys/a-kenji
similarity index 100%
rename from modules/nixos/builder/keys/a-kenji
rename to modules/nixos/community-builder/keys/a-kenji
diff --git a/modules/nixos/builder/keys/ckie b/modules/nixos/community-builder/keys/ckie
similarity index 100%
rename from modules/nixos/builder/keys/ckie
rename to modules/nixos/community-builder/keys/ckie
diff --git a/modules/nixos/builder/keys/fgaz b/modules/nixos/community-builder/keys/fgaz
similarity index 100%
rename from modules/nixos/builder/keys/fgaz
rename to modules/nixos/community-builder/keys/fgaz
diff --git a/modules/nixos/builder/keys/flokli b/modules/nixos/community-builder/keys/flokli
similarity index 100%
rename from modules/nixos/builder/keys/flokli
rename to modules/nixos/community-builder/keys/flokli
diff --git a/modules/nixos/builder/keys/jtojnar b/modules/nixos/community-builder/keys/jtojnar
similarity index 100%
rename from modules/nixos/builder/keys/jtojnar
rename to modules/nixos/community-builder/keys/jtojnar
diff --git a/modules/nixos/builder/keys/lewo b/modules/nixos/community-builder/keys/lewo
similarity index 100%
rename from modules/nixos/builder/keys/lewo
rename to modules/nixos/community-builder/keys/lewo
diff --git a/modules/nixos/builder/keys/raitobezarius b/modules/nixos/community-builder/keys/raitobezarius
similarity index 100%
rename from modules/nixos/builder/keys/raitobezarius
rename to modules/nixos/community-builder/keys/raitobezarius
diff --git a/modules/nixos/builder/keys/schmittlauch b/modules/nixos/community-builder/keys/schmittlauch
similarity index 100%
rename from modules/nixos/builder/keys/schmittlauch
rename to modules/nixos/community-builder/keys/schmittlauch
diff --git a/modules/nixos/builder/keys/stephank b/modules/nixos/community-builder/keys/stephank
similarity index 100%
rename from modules/nixos/builder/keys/stephank
rename to modules/nixos/community-builder/keys/stephank
diff --git a/modules/nixos/builder/keys/winter b/modules/nixos/community-builder/keys/winter
similarity index 100%
rename from modules/nixos/builder/keys/winter
rename to modules/nixos/community-builder/keys/winter
diff --git a/modules/nixos/builder/packages.nix b/modules/nixos/community-builder/packages.nix
similarity index 100%
rename from modules/nixos/builder/packages.nix
rename to modules/nixos/community-builder/packages.nix
diff --git a/modules/nixos/builder/users.nix b/modules/nixos/community-builder/users.nix
similarity index 100%
rename from modules/nixos/builder/users.nix
rename to modules/nixos/community-builder/users.nix