diff --git a/hosts/backstage/boot.nix b/hosts/backstage/boot.nix
deleted file mode 100644
index 88d32e5..0000000
--- a/hosts/backstage/boot.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{config, lib, ...}:
-{
-  # Use the systemd-boot EFI boot loader.
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
-      };
-    };
-    initrd = {
-      network = {
-        enable = true;
-        ssh = {
-          enable = true;
-          port = 22;
-          authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
-          hostKeys = [
-            "/boot/efi/initrd_id_ed25519"
-            "/boot/efi/initrd_id_rsa4096"
-          ];
-        };
-      };
-      systemd = {
-        enable = true;
-        network.enable = true;
-        network.networks.enp1s0 = config.systemd.network.networks.enp1s0;
-        targets.initrd.wants = [
-          "systemd-networkd-wait-online@enp1s0.service"
-        ];
-        users.root.shell = "/bin/systemd-tty-ask-password-agent";
-      };
-      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio_pci" "r8169" ];
-      kernelModules = [ "dm-snapshot" ];
-      luks.devices."backstage" = {
-        preLVM = true;
-        device = "/dev/disk/by-uuid/7f3ccd2d-8022-491e-baa1-675805919fd7";
-      };
-    };
-    kernelModules = [ "kvm-intel" ];
-    kernelParams = [
-      "zfs.zfs_arc_max=1024000000"
-      "intel_iommu=on"
-      "pci=assign-busses"
-    ];
-#    extraModprobeConfig = ''
-#      options ixgbe max_vfs=4 allow_unsupported_sfp=1 debug=2
-#    '';
-  };
-}
diff --git a/hosts/backstage/configuration.nix b/hosts/backstage/configuration.nix
index 0c1d306..44d1ad3 100644
--- a/hosts/backstage/configuration.nix
+++ b/hosts/backstage/configuration.nix
@@ -6,6 +6,45 @@
       ../../services/sshd
     ];
 
+  # Use the systemd-boot EFI boot loader.
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot/efi";
+      };
+    };
+    initrd = {
+      network = {
+        enable = true;
+        ssh = {
+          enable = true;
+          port = 22;
+          authorizedKeys = config.users.users.root.openssh.authorizedKeys.keys;
+          hostKeys = [
+            "/boot/efi/initrd_id_ed25519"
+            "/boot/efi/initrd_id_rsa4096"
+          ];
+        };
+      };
+      systemd = {
+        enable = true;
+        network = {
+          enable = true;
+          networks."10-dhcp" = {
+            matchConfig.Name = "enp1s0";
+            DHCP = "yes";
+          };
+        };
+        targets.initrd.wants = [
+          "systemd-networkd-wait-online@enp1s0.service"
+        ];
+        users.root.shell = "/bin/systemd-tty-ask-password-agent";
+      };
+    };
+  };
+
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
@@ -22,8 +61,6 @@
     git
     tmux
     htop
-    pciutils
-    ethtool
   ];
 
   users.users.root = {
diff --git a/hosts/backstage/default.nix b/hosts/backstage/default.nix
index 72b3230..39a4e28 100644
--- a/hosts/backstage/default.nix
+++ b/hosts/backstage/default.nix
@@ -5,6 +5,5 @@
     ./hardware-configuration.nix
     ./configuration.nix
     ./network.nix
-    ./boot.nix
   ];
 }
diff --git a/hosts/backstage/hardware-configuration.nix b/hosts/backstage/hardware-configuration.nix
index a7ba7ae..3d94fc9 100644
--- a/hosts/backstage/hardware-configuration.nix
+++ b/hosts/backstage/hardware-configuration.nix
@@ -5,6 +5,21 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
+  boot = {
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "virtio_pci" "r8169" ];
+      kernelModules = [ "dm-snapshot" ];
+      luks.devices."backstage" = {
+        preLVM = true;
+        device = "/dev/disk/by-uuid/7f3ccd2d-8022-491e-baa1-675805919fd7";
+      };
+    };
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [
+      "zfs.zfs_arc_max=1024000000"
+    ];
+  };
+
   fileSystems."/" =
     { device = "zpool/root";
       fsType = "zfs";
diff --git a/hosts/backstage/network.nix b/hosts/backstage/network.nix
index 110b076..e228c1e 100644
--- a/hosts/backstage/network.nix
+++ b/hosts/backstage/network.nix
@@ -1,51 +1,10 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   networking = {
     useNetworkd = true;
+    useDHCP = lib.mkDefault true;
     hostName = "backstage";
     hostId = "0ccd2304";
   };
-
-  systemd.network = {
-    enable = true;
-    links = {
-      "enp1s0" = {
-        enable = true;
-        matchConfig = {
-          Type = "ether";
-          MACAddress = "9c:6b:00:8d:d0:8f";
-        };
-        linkConfig = {
-          Name = "enp1s0";
-          NamePolicy = "";
-        };
-      };
-      "enp2s0f0" = {
-        enable = true;
-        matchConfig = {
-          Type = "ether";
-          MACAddress = "90:e2:ba:2e:ea:70";
-        };
-        linkConfig.MTUBytes = "9710";
-       };
-      "enp2s0f1" = {
-        enable = true;
-        matchConfig = {
-          Type = "ether";
-          MACAddress = "90:e2:ba:2e:ea:71";
-        };
-        linkConfig.MTUBytes = "9710";
-       };
-    };
-    networks = {
-      "enp1s0" = {
-        matchConfig.Name = "enp1s0";
-        DHCP = "yes";
-      };
-    };
-    netdevs = {
-
-    };
-  };
 }
diff --git a/hosts/backstage/radvd.nix b/hosts/backstage/radvd.nix
deleted file mode 100644
index d6b4407..0000000
--- a/hosts/backstage/radvd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{config, pkgs, ...}:
-{
-#  services.radvd.enable = true;
-#  services.radvd.config = ''
-#    interface br-infra
-#  '';
-}