diff --git a/hosts/rico1/hardware/filesystem.nix b/hosts/rico1/hardware/filesystem.nix
index e475109..19db23a 100644
--- a/hosts/rico1/hardware/filesystem.nix
+++ b/hosts/rico1/hardware/filesystem.nix
@@ -1,34 +1,40 @@
 _: {
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-partlabel/NIXOS_ROOT";
+      device = "/dev/disk/by-label/RICO1_ROOT";
       fsType = "btrfs";
       options = [ "subvol=@root" "compress-force=zstd" "noatime" ];
       neededForBoot = true;
     };
 
     "/nix" = {
-      device = "/dev/disk/by-partlabel/NIXOS_ROOT";
+      device = "/dev/disk/by-label/RICO1_ROOT";
       fsType = "btrfs";
       options = [ "subvol=@nix" "compress-force=zstd" "noatime" ];
       neededForBoot = true;
     };
 
     "/persist" = {
-      device = "/dev/disk/by-partlabel/NIXOS_ROOT";
+      device = "/dev/disk/by-label/RICO1_ROOT";
       fsType = "btrfs";
       options = [ "subvol=@persist" "compress-force=zstd" "noatime" ];
       neededForBoot = true;
     };
 
     "/mnt/system" = {
-      device = "/dev/disk/by-partlabel/NIXOS_ROOT";
+      device = "/dev/disk/by-label/RICO1_ROOT";
       fsType = "btrfs";
       options = [ "subvol=/" "compress-force=zstd" "noatime" ];
     };
 
     "/boot" = {
-      device = "/dev/disk/by-partlabel/NIXOS_BOOT";
+      device = "/dev/disk/by-label/RICO1_BOOT";
+      fsType = "ext2";
+      options = [ "noatime" ];
+    };
+
+    "/boot/firmware" = {
+      device = "/dev/disk/by-label/R1_FIRMWARE";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };