diff --git a/hosts/desktops/common/hardware.nix b/hosts/desktops/common/hardware.nix
index 19db6ac..18cf38f 100644
--- a/hosts/desktops/common/hardware.nix
+++ b/hosts/desktops/common/hardware.nix
@@ -4,7 +4,6 @@
   hardware = {
     xpadneo.enable = true;
     bluetooth.enable = true;
-    pulseaudio.enable = false;
     steam-hardware.enable = true; # Allow steam client to manage controllers
     graphics.enable32Bit = true; # For OpenGL games
     i2c.enable = true;
diff --git a/hosts/desktops/rotterdam/hardware-configuration.nix b/hosts/desktops/rotterdam/hardware-configuration.nix
index b47b652..524d0ab 100644
--- a/hosts/desktops/rotterdam/hardware-configuration.nix
+++ b/hosts/desktops/rotterdam/hardware-configuration.nix
@@ -18,7 +18,10 @@
         "usbhid"
         "sd_mod"
       ];
-      luks.devices."cryptroot".device = "/dev/disk/by-uuid/f7dd4142-7109-4493-834d-4a831777f08d";
+      luks.devices."cryptroot" = {
+        device = "/dev/disk/by-uuid/f7dd4142-7109-4493-834d-4a831777f08d";
+        keyFile = "/dev/disk/by-partuuid/add5fc14-e20f-48be-8b2a-0799ef04d3cb";
+      };
     };
     kernelModules = [ "kvm-amd" ];
   };
@@ -43,7 +46,7 @@
       ];
     };
     "/boot/efi" = {
-      device = "/dev/disk/by-uuid/1F5A-8945";
+      device = "/dev/disk/by-uuid/F2A2-CF5A";
       fsType = "vfat";
       options = [
         "noatime"