diff --git a/systems/etna/default.nix b/systems/etna/default.nix
index 0db80bc..3814731 100644
--- a/systems/etna/default.nix
+++ b/systems/etna/default.nix
@@ -32,7 +32,10 @@ in {
     };
   };
 
-  boot.loader.systemd-boot.enable = true;
+  boot = {
+    loader.systemd-boot.enable = true;
+    kernelPackages = pkgs.linuxPackages_6_1;
+  };
 
   services = {
     openssh.openFirewall = true;
diff --git a/systems/etna/hardware-configuration.nix b/systems/etna/hardware-configuration.nix
index a1b36f5..bfbe08d 100644
--- a/systems/etna/hardware-configuration.nix
+++ b/systems/etna/hardware-configuration.nix
@@ -25,6 +25,7 @@
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/FBB1-A79D";
     fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
   };
 
   fileSystems."/data" = {
@@ -32,7 +33,9 @@
     fsType = "ext4";
   };
 
-  swapDevices = [];
+  swapDevices = [
+    {device = "/dev/disk/by-uuid/4982538e-5402-44c0-86c6-bf086c856615";}
+  ];
 
   # 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