diff --git a/nixos/hosts/framework-server/disks.nix b/nixos/hosts/framework-server/disks.nix
index ba7fc454..7a5151ca 100644
--- a/nixos/hosts/framework-server/disks.nix
+++ b/nixos/hosts/framework-server/disks.nix
@@ -1,6 +1,4 @@
-{
-  imports = [ ../../common/services/snapper.nix ];
-  
+{  
   services.btrfs.autoScrub.enable = true;
   services.btrfs.autoScrub.interval = "weekly";
 
@@ -47,10 +45,6 @@
                   mountpoint = "/nix";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
-                "/.snapshots" = {
-                  mountpoint = "/.snapshots";
-                  mountOptions = [ "compress=zstd" "noatime" ];
-                }; # .snapshots
                 # Re-add this on the next refomrat 
                 # "/Storage" = {
                 #   mountpoint = "/Storage";
diff --git a/nixos/hosts/nixos-desktop/disks.nix b/nixos/hosts/nixos-desktop/disks.nix
index 88cca34c..b37433f4 100644
--- a/nixos/hosts/nixos-desktop/disks.nix
+++ b/nixos/hosts/nixos-desktop/disks.nix
@@ -35,7 +35,7 @@
               type = "btrfs";
               extraArgs = [ "-f" ];
               subvolumes = {
-                "/root" = {
+                "/" = {
                   mountpoint = "/";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # root
@@ -47,6 +47,18 @@
                   mountpoint = "/nix";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
+                "/.snapshots" = {
+                  mountpoint = "/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # root snapshots
+                "/home/.snapshots" = {
+                  mountpoint = "/home/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # home snapshots
+                "/nix/.snapshots" = {
+                  mountpoint = "/nix/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # nix snapshots
               }; # subvolumes
             }; # content.content
           }; # content
diff --git a/nixos/hosts/nixos-framework/disks.nix b/nixos/hosts/nixos-framework/disks.nix
index c6322a5b..bb53b07c 100644
--- a/nixos/hosts/nixos-framework/disks.nix
+++ b/nixos/hosts/nixos-framework/disks.nix
@@ -35,7 +35,7 @@
               type = "btrfs";
               extraArgs = [ "-f" ];
               subvolumes = {
-                "/root" = {
+                "/" = {
                   mountpoint = "/";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # root
@@ -47,6 +47,18 @@
                   mountpoint = "/nix";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
+                "/.snapshots" = {
+                  mountpoint = "/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # root snapshots
+                "/home/.snapshots" = {
+                  mountpoint = "/home/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # home snapshots
+                "/nix/.snapshots" = {
+                  mountpoint = "/nix/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # nix snapshots
               }; # subvolumes
             }; # content.content
           }; # content
diff --git a/nixos/hosts/nuc-server/disks.nix b/nixos/hosts/nuc-server/disks.nix
index bec29eed..e4fada1a 100644
--- a/nixos/hosts/nuc-server/disks.nix
+++ b/nixos/hosts/nuc-server/disks.nix
@@ -35,7 +35,7 @@
               type = "btrfs";
               extraArgs = [ "-f" ];
               subvolumes = {
-                "/root" = {
+                "/" = {
                   mountpoint = "/";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # root
@@ -47,6 +47,18 @@
                   mountpoint = "/nix";
                   mountOptions = [ "compress=zstd" "noatime" ];
                 }; # nix
+                "/.snapshots" = {
+                  mountpoint = "/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # root snapshots
+                "/home/.snapshots" = {
+                  mountpoint = "/home/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # home snapshots
+                "/nix/.snapshots" = {
+                  mountpoint = "/nix/.snapshots";
+                  mountOptions = [ "compress=zstd" "noatime" ];
+                }; # nix snapshots
               }; # subvolumes
             }; # content.content
           }; # content