diff --git a/hosts/nixos/nfss/home.nix b/hosts/nixos/nfss/home.nix
index 1f8ab83..8eea131 100644
--- a/hosts/nixos/nfss/home.nix
+++ b/hosts/nixos/nfss/home.nix
@@ -14,14 +14,15 @@
     Media = { enable = true; maxAgeDays = 7; };
     Archive = { enable = true; maxAgeDays = 30; };
     Consume = { enable = true; maxAgeDays = 7; };
+    DCIM = { enable = true; maxAgeDays = 7; path = "/mnt/storage/DCIM"; };
   };
 
   services.scheduled-commands.dcim-consume = {
-    enable = false;
+    enable = true;
     description = "Move files in dcim consume folder to DCIM";
     interval = "*-*-* *:00/15:00";
     commands = [
-      "photo-move -d /home/yanlin/Consume/dcim /mnt/essd/DCIM"
+      "photo-move -d /home/yanlin/Consume/dcim /mnt/storage/DCIM"
     ];
   };
 
diff --git a/hosts/nixos/nfss/system.nix b/hosts/nixos/nfss/system.nix
index 29637eb..8b2ded6 100644
--- a/hosts/nixos/nfss/system.nix
+++ b/hosts/nixos/nfss/system.nix
@@ -11,6 +11,7 @@
     ../../../modules/traefik.nix
     ../../../modules/borg/client.nix
     ../../../modules/media/server.nix
+    ../../../modules/file-server/samba.nix
   ];
 
   # GRUB bootloader with ZFS support
@@ -43,13 +44,13 @@
     "zfs.zfs_arc_min=2147483648"   # 2GB min ARC size
   ];
 
-  fileSystems."/mnt/essd" = {
+  fileSystems."/mnt/storage" = {
     device = "/dev/disk/by-uuid/20251dfb-f99a-4393-8c9e-0bb26d04b718";
     fsType = "ext4";
   };
 
   systemd.tmpfiles.rules = [
-    "d /mnt/essd 0755 yanlin users -"
+    "d /mnt/storage 0755 yanlin users -"
   ];
 
   # Network configuration
@@ -142,6 +143,10 @@
     deluge.enable = true;
   };
 
+  services.samba-custom.shares = {
+    DCIM = "/mnt/storage/DCIM";
+  };
+
   # Borg backup configuration
   services.borg-client-custom = {
     enable = false;
diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix
index cb1eab4..3aed2df 100644
--- a/hosts/nixos/thinkpad/home.nix
+++ b/hosts/nixos/thinkpad/home.nix
@@ -14,6 +14,7 @@
     Media = { enable = true; maxAgeDays = 7; };
     Archive = { enable = true; maxAgeDays = 30; };
     Consume = { enable = true; maxAgeDays = 7; };
+    DCIM = { enable = true; maxAgeDays = 7; path = "~/DCIM"; };
   };
   
   services.scheduled-commands.aicloud-backup = {
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
index a8f5517..cabe71a 100644
--- a/modules/syncthing.nix
+++ b/modules/syncthing.nix
@@ -44,6 +44,7 @@ in
       Media = mkFolderOptions "Media" { devices = lib.filter (d: d != "iphone") allDevices; };
       Archive = mkFolderOptions "Archive" {};
       Consume = mkFolderOptions "Consume" {};
+      DCIM = mkFolderOptions "DCIM" { devices = serverDevices; };
     };
     enableGui = lib.mkOption {
       type = lib.types.bool;