diff --git a/systems/x86_64-linux/bicboye/hardware.nix b/systems/x86_64-linux/bicboye/hardware.nix
index 3720266..6877139 100644
--- a/systems/x86_64-linux/bicboye/hardware.nix
+++ b/systems/x86_64-linux/bicboye/hardware.nix
@@ -10,14 +10,14 @@ _: {
         "usb_storage"
         "sd_mod"
       ];
-      luks.devices."root".device = "/dev/disk/by-uuid/e70bfc3c-1147-4af7-9bae-69f70146953f";
+      luks.devices."cryptroot".device = "/dev/disk/by-uuid/e570c2be-65df-4208-9cac-a03de08a6209";
     };
     kernelModules = ["kvm-intel"];
   };
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -30,7 +30,7 @@ _: {
     };
 
     "/home" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -42,7 +42,7 @@ _: {
     };
 
     "/.snapshots" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -54,7 +54,7 @@ _: {
     };
 
     "/var/log" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -66,7 +66,7 @@ _: {
     };
 
     "/etc/nixos" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -78,7 +78,7 @@ _: {
     };
 
     "/var/cache" = {
-      device = "/dev/disk/by-uuid/5cabc339-898c-4604-9bfc-0a2cf17e44ca";
+      device = "/dev/disk/by-uuid/a1b57a56-16d4-45ea-bac3-daeacd3dbcb2";
       fsType = "btrfs";
       options = [
         "defaults"
@@ -90,24 +90,13 @@ _: {
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/1C6C-122C";
+      device = "/dev/disk/by-uuid/B731-09A3";
       fsType = "vfat";
+      options = ["fmask=0022" "dmask=0022"];
     };
 
-    "/storage/immich" = {
-      device = "/dev/disk/by-uuid/bae65b7a-4f08-4b0d-963c-72e71bfcff46";
-      fsType = "btrfs";
-      options = [
-        "defaults"
-        "compress-force=zstd"
-        "noatime"
-        "user"
-      ];
-    };
-
-    # TODO: delete btrfs subvolume
-    "/storage/syncthing" = {
-      device = "/dev/disk/by-uuid/e3a4c251-a3e2-4b5e-a63b-70f53b51836a";
+    "/storage/media" = {
+      device = "/dev/disk/by-uuid/f8aadf58-d561-476b-a2c5-64b266dc5755";
       fsType = "btrfs";
       options = [
         "defaults"