diff --git a/hosts/Northstar/hardware-configuration.nix b/hosts/Northstar/hardware-configuration.nix
index 071ac936..2b9c8769 100644
--- a/hosts/Northstar/hardware-configuration.nix
+++ b/hosts/Northstar/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
@@ -27,7 +27,7 @@
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b3f20c52-6bc1-4c75-a75c-62c41afcacd2"; }
+    [ { device = "/dev/disk/by-uuid/c47fbb32-5c98-4e81-b72c-190a17f411a2"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking