diff --git a/ops/nixos/blade-janeway/default.nix b/ops/nixos/blade-janeway/default.nix
index 3dea69ce36..2d1c72c137 100644
--- a/ops/nixos/blade-janeway/default.nix
+++ b/ops/nixos/blade-janeway/default.nix
@@ -16,10 +16,9 @@ in {
   networking = {
     hostName = "blade-janeway";
     hostId = "3a62390f";
-    bonds.bond0.interfaces = [
-      "enp4s0f0" "enp4s0f1"
-      "enp5s0f0" "enp5s0f1"
-    ];
+    bridges.br-mgmt.interfaces = [ "enp4s0f0" ];
+    bridges.br-storage.interfaces = [ "enp4s0f2" ];
+    bridges.br-ext.interfaces = [ "enp5s0f0" ];
     interfaces.br-ext.ipv4.addresses = [{
       address = "192.168.1.180";
       prefixLength = 24;
diff --git a/ops/nixos/lib/blade.nix b/ops/nixos/lib/blade.nix
index 3159f12428..992dea283f 100644
--- a/ops/nixos/lib/blade.nix
+++ b/ops/nixos/lib/blade.nix
@@ -11,7 +11,7 @@ in {
   ];
 
   boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "uhci_hcd" "be2iscsi" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
-  boot.kernelModules = [ "kvm-amd" "acpi_power_meter" ];
+  boot.kernelModules = [ "kvm-amd" "acpi_power_meter" "acpi_ipmi" "ipmi_si" ];
   boot.kernelParams = [ "mitigations=off" ];
 
   fileSystems = let
@@ -39,19 +39,12 @@ in {
     domain = "house.as205479.net";
     nameservers = ["8.8.8.8" "8.8.4.4"];
     useDHCP = false;
-    bonds.bond0 = {
-      driverOptions = {
-        mode = "802.3ad";
-        miimon = "100";
-        lacp_rate = "fast";
-      };
-      interfaces = [
-        "enp4s0f0" "enp4s0f1"
-      ];
-    };
-    bridges.br-ext = {
-      interfaces = [ "bond0" ];
-      rstp = false;
+    bridges = let
+      br = interfaces: { inherit interfaces; rstp = false; };
+    in {
+      br-mgmt = br [ "enp4s0f0" ];
+      br-storage = br [ "enp4s0f1" ];
+      br-ext = br [ "enp4s0f2" ];
     };
 
     defaultGateway = "192.168.1.5";