diff --git a/flake.nix b/flake.nix
index cecaf3fc..15338a45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -401,12 +401,6 @@
           ];
         };
 
-        nix-build = nixosSystem' {
-          modules = [
-            ./hosts/containers/nix-build
-          ];
-        };
-
         pulsebert = nixosSystem' {
           modules = [
             ./hosts/pulsebert
diff --git a/hosts/containers/nix-build/copy.sh b/hosts/containers/nix-build/copy.sh
deleted file mode 100755
index 54cebdbd..00000000
--- a/hosts/containers/nix-build/copy.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-scp ./*.nix 172.22.99.156:/etc/nixos/
diff --git a/hosts/containers/nix-build/default.nix b/hosts/containers/nix-build/default.nix
deleted file mode 100644
index 7dd60874..00000000
--- a/hosts/containers/nix-build/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ hostRegistry, zentralwerk, config, pkgs, lib, ... }:
-{
-  imports = [
-    ./hardware-configuration.nix
-  ];
-
-  networking = {
-    hostName = "nix-build"; # Define your hostname.
-    useDHCP = false;
-    interfaces.enp6s18 = {
-      ipv4.addresses = [{
-        address = config.c3d2.hosts.nix-build.ip4;
-        prefixLength = zentralwerk.lib.config.site.net.serv.subnet4Len;
-      }];
-      useDHCP = false;
-    };
-    defaultGateway = "172.20.73.1";
-    # TODO: enable firewall
-    firewall.enable = false;
-    nameservers = [ "172.20.73.8" "9.9.9.9" ];
-  };
-
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.efiSysMountPoint = "/boot";
-    };
-
-    tmpOnTmpfs = true;
-    cleanTmpDir = true;
-
-    kernelModules = [ "kvm-intel" ];
-    binfmt.emulatedSystems = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "riscv64-linux" ];
-  };
-
-  nix = {
-    buildCores = 40;
-    maxJobs = 4;
-    trustedUsers = [ "client" ];
-  };
-
-  services.openssh.permitRootLogin = lib.mkForce "yes";
-
-  system.stateVersion = "20.09"; # Did you read the comment?
-}
diff --git a/hosts/containers/nix-build/hardware-configuration.nix b/hosts/containers/nix-build/hardware-configuration.nix
deleted file mode 100644
index 6ebe7666..00000000
--- a/hosts/containers/nix-build/hardware-configuration.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/41971a70-fb7f-4538-ae13-e1f4b27648fa";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/3320-D356";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-}
diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix
index c8fa7b59..b87f5e38 100644
--- a/hosts/hydra/hydra.nix
+++ b/hosts/hydra/hydra.nix
@@ -1,8 +1,5 @@
 { hostRegistry, config, lib, pkgs, ... }:
-
-let
-  nix-build = "client@${config.c3d2.hosts.nix-build.ip4}";
-in {
+{
   nix = {
     extraOptions = ''
       allowed-uris = http:// https:// ssh://
diff --git a/hosts/rpi-netboot/default.nix b/hosts/rpi-netboot/default.nix
index f97e475c..80142017 100644
--- a/hosts/rpi-netboot/default.nix
+++ b/hosts/rpi-netboot/default.nix
@@ -46,7 +46,7 @@
     };
      # mount the server's /nix/store
     "/nix/store" = {
-      device = "${hostRegistry.hosts.nix-build.ip4}:/nix/store";
+      device = "${hostRegistry.hosts.nfsroot.ip4}:/nix/store";
       fsType = "nfs";
       options = [ "nfsvers=3" "proto=tcp" "nolock" "hard" "async" "ro" ];
       neededForBoot = true;