diff --git a/machines/storage/s0/hardware-configuration.nix b/machines/storage/s0/hardware-configuration.nix
index df35130..d2858c9 100644
--- a/machines/storage/s0/hardware-configuration.nix
+++ b/machines/storage/s0/hardware-configuration.nix
@@ -8,31 +8,39 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "usb_storage" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.initrd.availableKernelModules = [
+    "ahci"
+    "usb_storage"
+    "bcache"
+  ];
+  boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/mapper/vg-root";
-      fsType = "btrfs";
-      options = [ "subvol=root" ];
-    };
+  boot.initrd.luks.devices."enc-pv1".device = "/dev/disk/by-uuid/36c4fab0-ea98-4ebc-9612-893f8f61c228";
+  boot.initrd.luks.devices."enc-pv2".device = "/dev/disk/by-uuid/514231c1-5934-401f-80e1-e3b6b62dc9d5";
+  boot.initrd.luks.devices."enc-pv3".device = "/dev/disk/by-uuid/f45abe73-d0c6-446f-b28c-7a96a3f87851";
+  boot.initrd.luks.devices."enc-pv4".device = "/dev/disk/by-uuid/953efe14-af9f-4fb5-a658-417ec02dbdda";
+  boot.initrd.luks.devices."enc-pv5".device = "/dev/disk/by-uuid/e8e40fd0-92d9-416b-b4aa-609d1ce64f42";
 
-  fileSystems."/home" =
-    { device = "/dev/mapper/vg-root";
-      fsType = "btrfs";
-      options = [ "subvol=home" ];
+  fileSystems."/" =
+    { device = "/dev/mapper/enc-pv1:/dev/mapper/enc-pv2:/dev/mapper/enc-pv3:/dev/mapper/enc-pv4:/dev/mapper/enc-pv5";
+      fsType = "bcachefs";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DF1E-0D0D";
+    { device = "/dev/disk/by-uuid/8F7E-53C4";
       fsType = "vfat";
     };
 
-  swapDevices =
-    [ { device = "/dev/mapper/vg-swap"; }
-    ];
+  swapDevices = [ ];
+
+  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+  # Per-interface useDHCP will be mandatory in the future, so this generated config
+  # replicates the default behaviour.
+  networking.useDHCP = lib.mkDefault false;
+  networking.interfaces.eth0.useDHCP = lib.mkDefault true;
+  networking.interfaces.eth1.useDHCP = lib.mkDefault true;
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-}
\ No newline at end of file
+}
diff --git a/machines/storage/s0/helios64/default.nix b/machines/storage/s0/helios64/default.nix
index 2be3dc7..6902703 100644
--- a/machines/storage/s0/helios64/default.nix
+++ b/machines/storage/s0/helios64/default.nix
@@ -9,17 +9,18 @@
 
   boot.kernelParams = lib.mkAfter [
     "console=ttyS2,115200n8"
-    "earlyprintk"
     "earlycon=uart8250,mmio32,0xff1a0000"
   ];
 
-  # disabled because, when enabled, bcachefs wants a different but still adequate kernel
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_16;
+  # Required for rootfs on sata
+  boot.initrd.availableKernelModules = [
+    "pcie-rockchip-host"
+    "phy-rockchip-pcie"
+    "phy-rockchip-usb"
+  ];
 
-  # bcachefs kernel is 5.15. but need a patch that is only in 5.16
+  # bcachefs kernel is 5.15. but need patches that are only in 5.16+
   # Patch the device tree to add support for getting the cpu thermal temp
   hardware.deviceTree.enable = true;
-  hardware.deviceTree.overlays = [
-    ./helios64-cpu-temp.dtbo
-  ];
+  hardware.deviceTree.kernelPackage = pkgs.linux_latest;
 }
diff --git a/machines/storage/s0/helios64/helios64-cpu-temp.dtbo b/machines/storage/s0/helios64/helios64-cpu-temp.dtbo
deleted file mode 100644
index 35f8ab3..0000000
Binary files a/machines/storage/s0/helios64/helios64-cpu-temp.dtbo and /dev/null differ
diff --git a/machines/storage/s0/helios64/helios64-cpu-temp.dts b/machines/storage/s0/helios64/helios64-cpu-temp.dts
deleted file mode 100644
index 107ee5f..0000000
--- a/machines/storage/s0/helios64/helios64-cpu-temp.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* rk3399-kobol-helios64.dts */
-
-/dts-v1/;
-/ {
-    model = "Kobol Helios64";
-	compatible = "kobol,helios64\0rockchip,rk3399";
-	fragment@0 {
-		target-path = "/";
-		__overlay__ {
-			tsadc@ff260000 {
-				status = "okay";
-				rockchip,hw-tshut-mode = <0x01>;
-				rockchip,hw-tshut-polarity = <0x01>;
-			};
-		};
-	};
-};