diff --git a/ubuntustudio/modules/fstab.conf b/ubuntustudio/modules/fstab.conf
index 2f4a016..54b6d10 100644
--- a/ubuntustudio/modules/fstab.conf
+++ b/ubuntustudio/modules/fstab.conf
@@ -1,11 +1,2 @@
-mountOptions:
-    default: defaults
-    btrfs: defaults,noatime,autodefrag
-ssdExtraMountOptions:
-    ext4: discard
-    jfs: discard
-    xfs: discard
-    swap: discard
-    btrfs: discard,compress=lzo
 crypttabOptions: luks,keyscript=/bin/cat
 efiMountOptions: umask=0077
diff --git a/ubuntustudio/modules/mount.conf b/ubuntustudio/modules/mount.conf
index 1efd5dd..155dca1 100644
--- a/ubuntustudio/modules/mount.conf
+++ b/ubuntustudio/modules/mount.conf
@@ -7,15 +7,29 @@ extraMounts:
       mountPoint: /sys
     - device: /dev
       mountPoint: /dev
-      options: bind
+      options: [ bind ]
     - device: tmpfs
       fs: tmpfs
       mountPoint: /run
     - device: /run/udev
       mountPoint: /run/udev
-      options: bind
-
-extraMountsEfi:
+      options: [ bind ]
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
+      efi: true
+
+mountOptions:
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: btrfs
+      options: [ defaults, noatime, autodefrag ]
+      ssdOptions: [ discard, compress=lzo ]
+    - filesystem: ext4
+      ssdOptions: [ discard ]
+    - filesystem: jfs
+      ssdOptions: [ discard ]
+    - filesystem: xfs
+      ssdOptions: [ discard ]
+    - filesystem: swap
+      ssdOptions: [ discard ]