diff --git a/machines/celerrime/default.nix b/machines/celerrime/default.nix
index 93de47a..8efdd22 100644
--- a/machines/celerrime/default.nix
+++ b/machines/celerrime/default.nix
@@ -22,6 +22,8 @@ in {
     gaming.enable = false;
     graphical.enable = true;
     latex.enable = true;
+    media-client.enable = true;
+    torrent.enable = true;
     virtualisation.enable = false;
     yggdrasil-client.enable = true;
   };
diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix
index 131225e..ba62a90 100644
--- a/machines/celerrime/hardware.nix
+++ b/machines/celerrime/hardware.nix
@@ -11,20 +11,24 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/c313a438-700c-4d9c-9413-354ebfb010eb";
-      fsType = "btrfs";
+    { device = "/dev/disk/by-uuid/aed0b311-8954-4164-afc3-9e7c6a2d8c2a";
+      fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."nixos-root".device = "/dev/disk/by-uuid/871dcf57-eee1-4dde-846d-e856c92f70c8";
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8551d309-afe6-4a25-b571-b2cb1eff7c09";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6CCA-1404";
+    { device = "/dev/disk/by-uuid/771E-1309";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/272341f1-b083-497e-b129-aef8732b5b50"; }
-    ];
+    [ {
+      device = "/dev/disk/by-partuuid/dace6477-697e-4bba-aede-eb0e9f7a28ff";
+      randomEncryption.enable = true;
+    } ];
+
+  networking.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";