diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py
index 0d151d39b066..d0a659c16695 100644
--- a/pyanaconda/modules/storage/devicetree/fsset.py
+++ b/pyanaconda/modules/storage/devicetree/fsset.py
@@ -776,6 +776,8 @@ def fstab(self):
                     break
             if device.encrypted:
                 options += ",x-systemd.device-timeout=0"
+            if fstype in ('ext4', 'btrfs', 'xfs', 'vfat'):
+                options += ",discard"
             devspec = device.fstab_spec
             dump = device.format.dump
             if device.format.check and mountpoint == "/":