diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f2f31f3..8b9c164 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 
 let
-  fsOptions = [ "noatime" "ssd" "space_cache" "compress=lzo" ];
+  fsOptions = [ "noatime" "ssd" "space_cache" "compress=zstd" ];
 
 in {
   imports =
@@ -29,8 +29,8 @@ in {
       reusePassphrases = true;
     };
 
-  fileSystems."/".options = fsOptions ++ [ "subvol=nixos_root" ];
-  fileSystems."/home".options = fsOptions ++ [ "subvol=home" ];
+  fileSystems."/".options = fsOptions ++ [ "subvol=nixos_root" "noatime" ];
+  fileSystems."/home".options = fsOptions ++ [ "subvol=home" "relatime" ];
   boot.tmpOnTmpfs = true;
   fileSystems."/tmp".fsType = "tmpfs";
 
diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix
index b695ddd..5246e94 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hardware-configuration.nix
@@ -17,6 +17,7 @@
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/DED9-661B";
       fsType = "vfat";
+      options = [ "discard" ];
     };
 
   fileSystems."/home" =