diff --git a/hosts/Infini-DESKTOP/hardware-configuration.nix b/hosts/Infini-DESKTOP/hardware-configuration.nix
index b5466e0..6cd3f63 100644
--- a/hosts/Infini-DESKTOP/hardware-configuration.nix
+++ b/hosts/Infini-DESKTOP/hardware-configuration.nix
@@ -16,53 +16,53 @@ in
       main = uuid "13f97ece-823e-4785-b06e-6c284105d379";
       esp = uuid "1DB7-2844";
 
-      btrfsOptions = [ "defaults" "autodefrag" "noatime" ];
+      commonOptions = [ "autodefrag" "noatime" "ssd" ];
     in
     {
       "/" = {
         device = "none";
         fsType = "tmpfs";
-        options = [ "defaults" "size=16G" "mode=755" ];
+        options = [ "defaults" "size=28G" "mode=755" ];
       };
 
       "/persist" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=root" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=root" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/persist/srv" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=root/srv" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=root/srv" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/etc/ssh" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvolid=262" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvolid=262" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/media/main" = {
         device = main;
         fsType = "btrfs";
-        options = [ "autodefrag" "noatime" "ssd" ];
+        options = commonOptions;
       };
 
       "/nix" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=nix" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=nix" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/boot" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=boot" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=boot" ] ++ commonOptions;
         neededForBoot = true;
       };
 
@@ -75,7 +75,7 @@ in
       "/home/infinidoge/Hydrus" = {
         device = uuid "2a025f29-4058-4a76-8f38-483f0925375d";
         fsType = "btrfs";
-        options = [ "subvol=Hydrus" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=Hydrus" ] ++ commonOptions;
       };
     };
 
diff --git a/hosts/Infini-FRAMEWORK/hardware-configuration.nix b/hosts/Infini-FRAMEWORK/hardware-configuration.nix
index 17f580d..f34c84f 100644
--- a/hosts/Infini-FRAMEWORK/hardware-configuration.nix
+++ b/hosts/Infini-FRAMEWORK/hardware-configuration.nix
@@ -16,6 +16,7 @@ in
   fileSystems =
     let
       main = uuid "a44af0ff-5667-465d-b80a-1934d1aab8d9";
+      commonOptions = [ "autodefrag" "noatime" "ssd" ];
     in
     {
       "/" = {
@@ -27,34 +28,34 @@ in
       "/persist" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=root" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=root" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/etc/ssh" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvolid=628" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvolid=628" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/media/main" = {
         device = main;
         fsType = "btrfs";
-        options = [ "autodefrag" "noatime" "ssd" ];
+        options = commonOptions;
       };
 
       "/nix" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=nix" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=nix" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/boot" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=boot" "autodefrag" "noatime" "ssd" ];
+        options = [ "subvol=boot" ] ++ commonOptions;
         neededForBoot = true;
       };
 
diff --git a/hosts/Infini-SERVER/hardware-configuration.nix b/hosts/Infini-SERVER/hardware-configuration.nix
index 2f7fb60..748c44c 100644
--- a/hosts/Infini-SERVER/hardware-configuration.nix
+++ b/hosts/Infini-SERVER/hardware-configuration.nix
@@ -21,7 +21,7 @@ in
       esp = uuid "A2B8-4C6E";
       data = uuid "59abb0ff-fe4e-4061-87d2-b728b937656a";
 
-      btrfsOptions = [ "defaults" "autodefrag" "noatime" ];
+      commonOptions = [ "autodefrag" "noatime" "ssd" ];
     in
     {
       "/" = {
@@ -33,35 +33,35 @@ in
       "/media/main" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=/" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=/" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/media/data" = lib.mkIf (data != null) {
         device = data;
         fsType = "btrfs";
-        options = [ "subvol=/" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=/" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/persist" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=root" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=root" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/etc/ssh" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvolid=264" "ssd" ] ++ btrfsOptions;
+        options = [ "subvolid=264" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/persist/srv" = lib.mkIf (data != null) {
         device = data;
         fsType = "btrfs";
-        options = [ "subvol=root/srv" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=root/srv" ] ++ commonOptions;
         neededForBoot = true;
       };
 
@@ -80,14 +80,14 @@ in
       "/nix" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=nix" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=nix" ] ++ commonOptions;
         neededForBoot = true;
       };
 
       "/boot" = {
         device = main;
         fsType = "btrfs";
-        options = [ "subvol=boot" "ssd" ] ++ btrfsOptions;
+        options = [ "subvol=boot" ] ++ commonOptions;
         neededForBoot = true;
       };