diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index b98691b..d480215 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -64,4 +64,9 @@ in
   boot.kernelParams = [];
 
   boot.kernelPackages = pkgs.linuxPackages;
+
+  # TODO: For "/" this cfg resides in base.nix
+  fileSystems = {
+    "/mnt/data".options = [ "compress=zstd" "noatime" "commit=120" ];
+  };
 }
diff --git a/hosts/yodaNas/hardware-configuration.nix b/hosts/yodaNas/hardware-configuration.nix
index 3f26aa6..1ea57de 100644
--- a/hosts/yodaNas/hardware-configuration.nix
+++ b/hosts/yodaNas/hardware-configuration.nix
@@ -38,6 +38,13 @@
       options = [ "subvol=@swap" ];
     };
 
+  fileSystems."/mnt/data" =
+    { device = "/dev/disk/by-uuid/c385a436-0288-486f-a2b9-c64c2db667e7";
+      fsType = "btrfs";
+    };
+
+  boot.initrd.luks.devices."12tb1".device = "/dev/disk/by-uuid/68c349e8-5118-4773-9fd5-5dbad9acee4e";
+
   swapDevices = [ { device = "/swap/swapfile"; } ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index a805feb..46a45e3 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -63,4 +63,9 @@ in
   boot.kernelParams = [];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  # TODO: For "/" this cfg resides in base.nix
+  fileSystems = {
+    "/mnt/512gb".options = [ "compress=zstd" "noatime" "commit=120" ];
+  };
 }