diff --git a/flake.nix b/flake.nix
index 9ca4fd41..452cf6bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,11 +65,6 @@
         in {
           inherit (pkgs) bmxd;
 
-          dhcp-nixos-rebuild = mkDeploy {
-            name = "dhcp";
-            host = hostRegistry.hosts.dhcp.ip4;
-          };
-
           glotzbert-nixos-rebuild = mkDeploy { name = "glotzbert"; };
           glotzbert-wake = mkWake "glotzbert";
 
@@ -143,15 +138,6 @@
           });
       in {
 
-        dhcp = nixosSystem' {
-          modules = [
-            ./hosts/containers/dhcp
-            secrets.nixosModules.admins
-            secrets.nixosModules.dhcp
-          ];
-          system = "x86_64-linux";
-        };
-
         freifunk = nixosSystem' {
           modules = [
             ./hosts/containers/freifunk
@@ -175,7 +161,7 @@
         };
 
         pulsebert = nixosSystem' {
-          modules = [ ./hosts/pulsebert secrets.nixosModules.dhcp ];
+          modules = [ ./hosts/pulsebert ];
           system = "aarch64-linux";
         };
 
diff --git a/host-registry.nix b/host-registry.nix
index 0646ac82..e1b9cd6a 100644
--- a/host-registry.nix
+++ b/host-registry.nix
@@ -2,11 +2,6 @@
 
 rec {
   hosts = {
-    dhcp = {
-      ip4 = "172.22.99.254";
-      publicKey =
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUrz1JqoyYm4zITHgUbhKCYV6wcE6qMcTjKSLAVlVyf";
-    };
     grafana.publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPFB9fo01jzr2upEBEXiR7sSmeQoq9ll5Cf5/hjq5e4Y";
     ledstripes.publicKey =
diff --git a/hosts/containers/dhcp/default.nix b/hosts/containers/dhcp/default.nix
deleted file mode 100644
index d98a041e..00000000
--- a/hosts/containers/dhcp/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, lib, hostRegistry, ... }:
-
-{
-  imports = [ ../../../lib/lxc-container.nix ../../../lib/shared.nix ];
-
-  c3d2 = {
-    isInHq = true;
-    hq.interface = "eth0";
-  };
-
-  networking.hostName = "dhcp";
-  networking.defaultGateway = "172.22.99.1";
-  networking.interfaces.eth0 = {
-    ipv4.addresses = [{
-      address = hostRegistry.hosts.dhcp.ip4;
-      prefixLength = 24;
-    }];
-    useDHCP = lib.mkForce false;
-  };
-
-  # dhcp
-  networking.firewall.allowedUDPPorts = [ 67 68 ];
-
-  services.dhcpd4 = {
-    enable = true;
-    interfaces = [ config.c3d2.hq.interface ];
-    authoritative = true;
-    # the leases are defined in the secrets module imported
-    # at the top-level of this flake
-  };
-
-}
diff --git a/hq.nixops b/hq.nixops
index 6b899864..7b63de7d 100644
--- a/hq.nixops
+++ b/hq.nixops
@@ -1,18 +1,6 @@
 {
   network.description = "C3D2 HQ";
 
-  "dhcp" =
-    { ... }:
-    {
-      imports = [
-        hosts/containers/dhcp/configuration.nix
-      ];
-      deployment = {
-        targetHost = "2a00:8180:2c00:223:3801:15ff:fe95:8988";
-        storeKeysOnMachine = true;
-      };
-    };
-
   "mucbot" =
     { ... }:
     {