diff --git a/users/wpcarro/nixos/ava/hardware.nix b/users/wpcarro/nixos/ava/hardware.nix
index 9892bdc58..4bfdca1cc 100644
--- a/users/wpcarro/nixos/ava/hardware.nix
+++ b/users/wpcarro/nixos/ava/hardware.nix
@@ -13,13 +13,13 @@
 
   fileSystems."/" =
     {
-      device = "/dev/disk/by-uuid/60d92789-c44e-4620-885d-1d81d0759f1d";
+      device = "/dev/disk/by-label/NIXROOT";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
     {
-      device = "/dev/disk/by-uuid/C62C-9B32";
+      device = "/dev/disk/by-label/NIXBOOT";
       fsType = "vfat";
     };
 
diff --git a/users/wpcarro/nixos/marcus/hardware.nix b/users/wpcarro/nixos/marcus/hardware.nix
index cd80685ab..329926269 100644
--- a/users/wpcarro/nixos/marcus/hardware.nix
+++ b/users/wpcarro/nixos/marcus/hardware.nix
@@ -11,12 +11,12 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/b8b911ee-e9b9-40ea-89d6-551f11350e7b";
+    device = "/dev/disk/by-label/NIXROOT";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/A7EA-369C";
+    device = "/dev/disk/by-label/NIXBOOT";
     fsType = "vfat";
   };