diff --git a/system/nixinator/hardware-configuration.nix b/system/nixinator/hardware-configuration.nix
index d18f1a81..e52e5ee9 100644
--- a/system/nixinator/hardware-configuration.nix
+++ b/system/nixinator/hardware-configuration.nix
@@ -89,27 +89,30 @@
     # Using  NFS over TCP or increasing the value of the retrans option may mitigate
     # some of the risks of using the soft option.
 
-    # TODO: New HDDs
-    # "/home/${username}/Movies" = {
-    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-    #   fsType = "nfs";
-    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    # };
-    # "/home/${username}/Shows" = {
-    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-    #   fsType = "nfs";
-    #   options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
-    # };
+    # Synology DS223j
 
-    "/home/${username}/Music" = {
-      # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
-      device = "192.168.86.20:/mnt/Music/Music";
+    "/home/${username}/Restic" = {
+      device = "192.168.86.15:/volume1/NixinatorPersistence";
       fsType = "nfs";
       options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
 
-    "/home/${username}/Restic" = {
-      device = "192.168.86.15:/volume1/NixinatorPersistence";
+    # TrueNAS
+
+    "/home/${username}/Movies" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
+      fsType = "nfs";
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    };
+
+    "/home/${username}/Shows" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
+      fsType = "nfs";
+      options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
+    };
+
+    "/home/${username}/Music" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
     };
diff --git a/system/servenix/hardware-configuration.nix b/system/servenix/hardware-configuration.nix
index 8efcf93f..1ce142f8 100644
--- a/system/servenix/hardware-configuration.nix
+++ b/system/servenix/hardware-configuration.nix
@@ -44,23 +44,22 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # SG Exos Mirror Shares
+    # TrueNAS
 
-    # TODO: New HDDs
-    # "/media/Movie" = {
-    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
-    #   fsType = "nfs";
-    #   options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
-    # };
-    # "/media/Show" = {
-    #   device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
-    #   fsType = "nfs";
-    #   options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
-    # };
+    "/media/Movie" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    };
+
+    "/media/Show" = {
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
+      fsType = "nfs";
+      options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
+    };
 
     "/media/TV-Music" = {
-      # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
-      device = "192.168.86.20:/mnt/Music/Music";
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
diff --git a/system/thinknix/hardware-configuration.nix b/system/thinknix/hardware-configuration.nix
index 00110f56..585704bb 100644
--- a/system/thinknix/hardware-configuration.nix
+++ b/system/thinknix/hardware-configuration.nix
@@ -40,22 +40,22 @@
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
-    # SG Exos Mirror Shares
+    # TrueNAS
 
     "/media/Movie" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
+      device = "192.168.86.20:/mnt/Seagate4TB/Movies";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/Show" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
+      device = "192.168.86.20:/mnt/Seagate4TB/Shows";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };
 
     "/media/TV-Music" = {
-      device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
+      device = "192.168.86.20:/mnt/Seagate4TB/Music";
       fsType = "nfs";
       options = ["defaults" "rw" "relatime" "_netdev" "bg" "soft"];
     };