diff --git a/calamares/modules/fstab.conf b/calamares/modules/fstab.conf
index b2f3de3..44be023 100644
--- a/calamares/modules/fstab.conf
+++ b/calamares/modules/fstab.conf
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
 # Creates /etc/fstab and /etc/crypttab in the target system.
 # Also creates mount points for all the filesystems.
 #
@@ -10,7 +13,7 @@
 # options from this mapping.
 mountOptions:
     default: defaults,noatime
-    btrfs: defaults,noatime,space_cache,autodefrag
+    btrfs: defaults,noatime,space_cache,autodefrag,compress=zstd
 
 # 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,
@@ -20,12 +23,25 @@ efiMountOptions: umask=0077
 # If a filesystem is on an SSD, add the following options. If a specific
 # filesystem is listed here, use those options, otherwise no additional
 # options are set (i.e. there is no *default* like in *mountOptions*).
+#
+# This example configuration applies the *discard* option to most
+# common filesystems on an SSD. This may not be the right option
+# for your distribution. If you use a systemd timer to trim the
+# SSD, it may interfere with the *discard* option. Opinions vary
+# as to whether *discard* is worth the effort -- it depends on
+# the usage pattern of the disk as well.
+#
+# ssdExtraMountOptions:
+#     ext4: discard
+#     jfs: discard
+#     xfs: discard
+#     swap: discard
+#     btrfs: discard,compress=lzo
+#
+# The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
+# and does nothing for other filesystems.
 ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
+    btrfs: discard=async,ssd,commit=120
 
 # Additional options added to each line in /etc/crypttab
 crypttabOptions: luks