diff --git a/hosts/nas/filesystems.nix b/hosts/nas/filesystems.nix
index 6d2a1a7..97d0833 100644
--- a/hosts/nas/filesystems.nix
+++ b/hosts/nas/filesystems.nix
@@ -7,8 +7,7 @@
   ...
 }:
 let
-  btrfsOptions = [
-    "subvol=nix-app-data"
+  defaultOptions = [
     "compress=zstd"
   ];
 in
@@ -18,103 +17,151 @@ in
     fsType = "btrfs";
     options = [
       "subvol=nix-app-data"
-      "compress=zstd"
-    ];
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/ssd/ssd_app_data" = {
     device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=ssd_app_data"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/ssd/mariadb" = {
     device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=mariadb"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/ssd/VMs" = {
     device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=VMs"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/3d_printer" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=3d_printer"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/backup" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=backup"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/books" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=books"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/documents" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=documents"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/homeassistant" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=homeassistant"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/isos" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=isos"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/movies" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=movies"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/nextcloud" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=nextcloud"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/photos" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=photos"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/switch" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=switch"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/tv" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=tv"
+    ]
+    ++ defaultOptions;
   };
 
   fileSystems."/media/nas/main/timemachine" = {
     device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
     fsType = "btrfs";
-    options = btrfsOptions;
+    options = [
+      "subvol=timemachine"
+    ]
+    ++ defaultOptions;
   };
 
   # fileSystems."/media/nas/main/vms" = {
   #   device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
   #   fsType = "btrfs";
-  #   options = btrfsOptions;
+  #   options = [
+  #     "subvol=vms"
+  #   ]
+  #   ++ defaultOptions;
   # };
 }