diff --git a/hosts/randolph/configuration.nix b/hosts/randolph/configuration.nix
index 1215633..7a2e9aa 100644
--- a/hosts/randolph/configuration.nix
+++ b/hosts/randolph/configuration.nix
@@ -15,7 +15,11 @@
   ################################################
   # SECTION 1: BASIC SYSTEM SOFTWARE CONFIGURATION
   ################################################
-
+  # We need to do the following for LUKS setup
+  boot.initrd.kernelModules = [ "cryptd" ];
+  boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p2";
+  hardware.enableAllFirmware = true;
+ 
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/hosts/randolph/hardware-configuration.nix b/hosts/randolph/hardware-configuration.nix
index e319b99..92e732a 100644
--- a/hosts/randolph/hardware-configuration.nix
+++ b/hosts/randolph/hardware-configuration.nix
@@ -8,35 +8,26 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "uas" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
-  boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p2";
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/lvmroot/root";
+    { device = "/dev/mapper/lvmroot-root";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/39B5-9DA9";
+    { device = "/dev/disk/by-uuid/D9C8-2EB6";
       fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/lvmroot/swap"; }
+    [ { device = "/dev/mapper/lvmroot-swap"; }
     ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }