diff --git a/machines/hitagi/README.md b/machines/hitagi/README.md
index cf694da..6dba2ac 100644
--- a/machines/hitagi/README.md
+++ b/machines/hitagi/README.md
@@ -8,9 +8,7 @@ Custom build in a be quiet! Pure Base 500.
  * CPU: AMD Ryzen 7 5800X
  * RAM: 2×16GB G.Skill Aegis DDR4-3200 CL16 (not because it is anything special)
  * PSU: be quiet! System Power 10 750W
- * Main SSD: 250GB Samsung 970 Evo Pro NVMe
- * Secondary SSD: 256GB micron MTFDDAK256TBN-1AR15ABHA SATA
- * HDD: 2TB Toshiba HDWA120
+ * SSD: 1TB Samsung 980 Pro NVMe
  * GPU: Intel Arc A770 Limited Edition (16GB VRAM)
  * Case fans: 2 be quiet! Pure Wings 2 140 mm (included in case), 3 more with PWM
  * CPU Cooler: Noctua NH-U12S with an additional NF-F12 PWM
diff --git a/machines/hitagi/hardware-configuration.nix b/machines/hitagi/hardware-configuration.nix
index 5850bc3..333909b 100644
--- a/machines/hitagi/hardware-configuration.nix
+++ b/machines/hitagi/hardware-configuration.nix
@@ -26,7 +26,7 @@
       luks.devices = {
         root = {
           name = "root";
-          device = "/dev/disk/by-uuid/1607bb2a-329b-4252-b11a-b43eb6b7bf0c";
+          device = "/dev/disk/by-uuid/63c6aa7c-47c5-43f5-b0eb-c32b0768327b";
           preLVM = true;
           allowDiscards = true;
         };
@@ -36,44 +36,19 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/9e6b279e-6995-44da-b673-21b9e23a5278";
+      device = "/dev/disk/by-uuid/3994f497-9848-459e-9642-cbc14a7d3c97";
       fsType = "btrfs";
       options = [ "discard=async" "noatime" "compress=zstd" ];
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/75DA-DFE2";
+      device = "/dev/disk/by-uuid/96B6-34BD";
       fsType = "vfat";
     };
-
-    "/data" = {
-      device = "/dev/mapper/data";
-      fsType = "btrfs";
-      options = [ "compress=zstd" ];
-      encrypted = {
-        label = "data";
-        enable = true;
-        blkDev = "/dev/disk/by-uuid/7f4ba71e-3aca-4294-b37f-49f37b584dbd";
-        keyFile = "/mnt-root/root/luks-data";
-      };
-    };
-
-    "/data/ssd" = {
-      device = "/dev/mapper/data-ssd";
-      fsType = "btrfs";
-      options = [ "discard=async" "noatime" "compress=zstd" ];
-      encrypted = {
-        # !!! HACK
-        label = "data-ssd --allow-discards";
-        enable = true;
-        blkDev = "/dev/disk/by-uuid/41baa168-7fa0-4eb3-b314-50766ddf126d";
-        keyFile = "/mnt-root/root/luks-data";
-      };
-    };
   };
 
   swapDevices = [
-    { device = "/dev/disk/by-uuid/2774d182-ddc9-4d79-886e-995fcd60a88a"; }
+    { device = "/dev/disk/by-uuid/98de7ced-4d7c-4915-bf5b-1a0300458ea6"; }
   ];
 
   # GPU