diff --git a/hosts/intuos/disko/default.nix b/hosts/intuos/disko/default.nix
index e331bc94..4d195170 100644
--- a/hosts/intuos/disko/default.nix
+++ b/hosts/intuos/disko/default.nix
@@ -54,21 +54,34 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                    "ssd"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
 
                 # Impermanence
                 "/persist" = {
                   mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/persist/.snapshots" = { };
                 "/persist/home" = { };
diff --git a/hosts/jupiter/disko/default.nix b/hosts/jupiter/disko/default.nix
index f2143dbe..900c8a59 100644
--- a/hosts/jupiter/disko/default.nix
+++ b/hosts/jupiter/disko/default.nix
@@ -48,21 +48,34 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                    "ssd"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
 
                 # Impermanence
                 "/persist" = {
                   mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/persist/.snapshots" = { };
                 "/persist/home" = { };
diff --git a/hosts/kitty/disko/default.nix b/hosts/kitty/disko/default.nix
index 05abe201..2191e808 100644
--- a/hosts/kitty/disko/default.nix
+++ b/hosts/kitty/disko/default.nix
@@ -48,21 +48,34 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                    "ssd"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
 
                 # Impermanence
                 "/persist" = {
                   mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [ 
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/persist/.snapshots" = { };
                 "/persist/home" = { };
diff --git a/hosts/midas/disko/default.nix b/hosts/midas/disko/default.nix
index 0a3d6820..60e95465 100644
--- a/hosts/midas/disko/default.nix
+++ b/hosts/midas/disko/default.nix
@@ -54,15 +54,25 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                    "ssd"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
               };
             };
@@ -78,7 +88,4 @@
       };
     };
   };
-
-  # Needed for impermanence
-  fileSystems."/persist".neededForBoot = true;
 }
diff --git a/hosts/midas/filesystems/default.nix b/hosts/midas/filesystems/default.nix
index 592e2115..0abb186a 100644
--- a/hosts/midas/filesystems/default.nix
+++ b/hosts/midas/filesystems/default.nix
@@ -7,7 +7,6 @@
       neededForBoot = true;
       options = [
         "compress=zstd"
-        "noatime"
         "subvol=persist"
       ];
     };
diff --git a/hosts/prophet/disko/default.nix b/hosts/prophet/disko/default.nix
index 4c9e68d6..4961d53b 100644
--- a/hosts/prophet/disko/default.nix
+++ b/hosts/prophet/disko/default.nix
@@ -48,21 +48,34 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" "noexec" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                    "ssd"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
 
                 # Impermanence
                 "/persist" = {
                   mountpoint = "/persist";
-                  mountOptions = [ "compress=zstd" "noatime" "ssd" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "ssd"
+                  ];
                 };
                 "/persist/.snapshots" = { };
                 "/persist/home" = { };
diff --git a/hosts/redmond/disko/default.nix b/hosts/redmond/disko/default.nix
index ed71a3db..4ebcb697 100644
--- a/hosts/redmond/disko/default.nix
+++ b/hosts/redmond/disko/default.nix
@@ -54,21 +54,24 @@
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
-                  mountOptions = [ "compress=zstd" "noatime" ];
+                  mountOptions = [ "compress=zstd" ];
                 };
                 "/prev" = {
                   mountpoint = "/prev";
-                  mountOptions = [ "compress=zstd" "noatime" ];
+                  mountOptions = [
+                    "compress=zstd"
+                    "noexec"
+                  ];
                 };
                 "/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [ "compress=zstd" "noatime" ];
+                  mountOptions = [ "compress=zstd" ];
                 };
 
 	        # Impermanence
 	        "/persist" = {
 	          mountpoint = "/persist";
-	          mountOptions = [ "compress=zstd" "noatime" ];
+	          mountOptions = [ "compress=zstd" ];
 	        };
                 "/persist/.snapshots" = { };
                 "/persist/home" = { };
diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix
index be224a63..a5d6345a 100644
--- a/hosts/tower/disko/default.nix
+++ b/hosts/tower/disko/default.nix
@@ -7,6 +7,7 @@
       "${config.networking.hostName}" = {
         type = "disk";
         device = "/dev/nvme0n1";
+        imageSize = "32G";
         content = {
           type = "gpt";
           partitions = {
@@ -63,6 +64,7 @@
                   mountpoint = "/prev";
                   mountOptions = [
                     "compress=zstd"
+                    "noexec"
                     "ssd"
                   ];
                 };