diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf
index b2f3de361..7724fd841 100644
--- a/src/modules/fstab/fstab.conf
+++ b/src/modules/fstab/fstab.conf
@@ -10,7 +10,7 @@
 # options from this mapping.
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime,space_cache
 
 # Mount options to use for the EFI System Partition. If not defined, the
 # *mountOptions* for *vfat* are used, or if that is not set either,
@@ -25,7 +25,7 @@ ssdExtraMountOptions:
     jfs: discard
     xfs: discard
     swap: discard
-    btrfs: discard,compress=lzo
+    btrfs: ssd,compress=zstd,commit=120
 
 # Additional options added to each line in /etc/crypttab
 crypttabOptions: luks