diff --git a/modules/baseline.nix b/modules/baseline.nix
index e5071b2..766e4c1 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -6,9 +6,13 @@
   ...
 }:
 let
-  builderHosts = (
-    lib.attrNames (lib.filterAttrs (_: v: v.config.greg.remote-builder.enable) self.nixosConfigurations)
-  );
+  builderHosts =
+    if self != null then
+      (lib.attrNames (
+        lib.filterAttrs (_: v: v.config.greg.remote-builder.enable) self.nixosConfigurations
+      ))
+    else
+      [ ];
 in
 {
   # Enable flakes
diff --git a/modules/nixos/container.nix b/modules/nixos/container.nix
index 5b8de59..401e3cd 100644
--- a/modules/nixos/container.nix
+++ b/modules/nixos/container.nix
@@ -34,6 +34,7 @@ let
             container.builder
           ];
 
+          _module.args.self = null; # Prevents containers from getting builder access
           nixpkgs.overlays = overlays;
 
           networking = {