diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 65bc669..b935329 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -100,7 +100,7 @@
     };
 
   fileSystems."/mnt/Mars" =
-    { device = "nas:/Mars";
+    { device = "jupiter:/Mars";
       fsType = "nfs";
       options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
     };
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index 499fd56..1812420 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -23,7 +23,7 @@
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
     (import ../../modules/desktop/virtualisation) ++   # Docker
-#    (import ../../modules/services/nas) ++                       # Server Services
+    (import ../../modules/services/nas) ++                       # Server Services
     (import ../../modules/hardware);                                # Hardware devices
 
   boot = {                                  # Boot options
diff --git a/hosts/jupiter/hardware-configuration.nix b/hosts/jupiter/hardware-configuration.nix
index 52bcd97..5f04d45 100644
--- a/hosts/jupiter/hardware-configuration.nix
+++ b/hosts/jupiter/hardware-configuration.nix
@@ -66,7 +66,7 @@
                           subvolume = {
                               "@" = {};
                               "@home" = {};
-#                              "@nas/home" = {};
+                              "@nas/Home" = {};
                           };
                       };
                   };
@@ -132,12 +132,12 @@
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
     };
 
-#    fileSystems."/mnt/snapshots/Mars" =
-#    { device = "/dev/disk/by-label/NIXROOT";
-#      fsType = "btrfs";
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
-#    };
-#
+    fileSystems."/mnt/snapshots/Mars" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ];
+    };
+
 #  fileSystems."/mnt/snapshots/Pluto" =
 #    { device = "/dev/disk/by-label/NAS-RAID";
 #      fsType = "btrfs";
@@ -150,11 +150,11 @@
 #      options = [ "compress=zstd,space_cache=v2,noatime,subvol=@" ];
 #    };
 #
-#  fileSystems."/mnt/Mars" =
-#    { device = "/dev/disk/by-label/NIXROOT";
-#      fsType = "btrfs";
-#      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
-#    };
+  fileSystems."/mnt/Mars" =
+    { device = "/dev/disk/by-label/NIXROOT";
+      fsType = "btrfs";
+      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ];
+    };
 
   fileSystems."/boot" =
     { device = "/dev/disk/by-label/NIXBOOT";
@@ -165,11 +165,11 @@
 #    { device = "/mnt/Pluto";
 #      options = [ "bind" ];
 #    };
-# 
-#  fileSystems."/export/Mars" =
-#    { device = "/mnt/Mars";
-#      options = [ "bind" ];
-#    };
+ 
+  fileSystems."/export/Mars" =
+    { device = "/mnt/Mars";
+      options = [ "bind" ];
+    };
  
   swapDevices = [ ];
   
@@ -239,7 +239,8 @@
   powerManagement = {
     cpuFreqGovernor = lib.mkDefault "powersave";
     powertop.enable = true;
-#    powerUpCommands = ''
+    scsiLinkPolicy = "med_power_with_dipm";
+    #    powerUpCommands = ''
 #      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088
 #      ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2
 #    '';
diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix
index 618fed9..cecf72b 100644
--- a/hosts/laptop/hardware-configuration.nix
+++ b/hosts/laptop/hardware-configuration.nix
@@ -117,7 +117,7 @@
     };
 
   fileSystems."/mnt/Mars" =
-    { device = "nas:/Mars";
+    { device = "jupiter:/Mars";
       fsType = "nfs";
       options = [ "noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
     };
diff --git a/hosts/steamdeck/hardware-configuration.nix b/hosts/steamdeck/hardware-configuration.nix
index 09f6510..4dc80e9 100644
--- a/hosts/steamdeck/hardware-configuration.nix
+++ b/hosts/steamdeck/hardware-configuration.nix
@@ -113,7 +113,7 @@
     };
 
   fileSystems."/mnt/Mars" =
-    { device = "nas:/Mars";
+    { device = "jupiter:/Mars";
       fsType = "nfs";
       options = [ "nofail,noauto,users,x-systemd.automount,x-systemd.device-timeout=10,soft,timeo=14,x-systemd.idle-timeout=1min,sec=sys,exec,nfsvers=4.2" ];
     };