diff --git a/flake.nix b/flake.nix
index bd8684c8..b68fcbf4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,9 +116,8 @@
                 users = let
                   authorizedKeys.keys = [
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDOcgeR3hh23aTiXnyC37xdP8oXfTZbbjgWzkUyxhT9P root@Vanguard"
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANfkqd5lPTsSPU3SRYnAa1UjCYDmDeBTyzq5McmWlm6 xenia@Vanguard"
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ/ZSSCN5sqrA+tdoIZr5EUm5DRuBV4dQ7J+QBEtUwUU xenia@Northstar"
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN3fRij9Tm6davrSQOPYEZP7CdZdZ0D9ogWXWjpTs40e pixelifytica@Northstar"
                   ];
                 in {
                   root.openssh = {inherit authorizedKeys;};
diff --git a/hosts/Northstar/hardware-configuration.nix b/hosts/Northstar/hardware-configuration.nix
index 9314a582..071ac936 100644
--- a/hosts/Northstar/hardware-configuration.nix
+++ b/hosts/Northstar/hardware-configuration.nix
@@ -14,17 +14,20 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/f4c91844-b4a2-45dc-8ba9-c532a352a8ce";
-      fsType = "btrfs";
+    { device = "/dev/disk/by-uuid/3903903d-7053-4dd1-936f-731dcbb543a9";
+      fsType = "ext4";
     };
 
+  boot.initrd.luks.devices."luks-b25f58be-382c-4353-bd98-6416ee079ef5".device = "/dev/disk/by-uuid/b25f58be-382c-4353-bd98-6416ee079ef5";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F6B7-E162";
+    { device = "/dev/disk/by-uuid/1C8E-067E";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b85989dd-a91c-41ac-a32d-65aa7e572248"; }
+    [ { device = "/dev/disk/by-uuid/b3f20c52-6bc1-4c75-a75c-62c41afcacd2"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking