diff --git a/hosts/nixos/nfss/system.nix b/hosts/nixos/nfss/system.nix
index 626e5fd..62032c5 100644
--- a/hosts/nixos/nfss/system.nix
+++ b/hosts/nixos/nfss/system.nix
@@ -144,9 +144,10 @@
 
   # Borg backup configuration
   services.borg-client-custom = {
-    enable = false;
-    repositoryUrl = "ssh://borg-box/./nfss";
+    enable = true;
+    repositoryUrl = "ssh://nfss@thinkpad/./";
     backupPaths = [
+      "/mnt/essd/DCIM"
     ];
     backupFrequency = "*-*-* 01:00:00";
     retention = {
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index b63b0fd..e8a9d61 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -8,6 +8,7 @@
     ../../../modules/podman.nix
     ../../../modules/vpn/tailscale.nix
     ../../../modules/borg/client.nix
+    ../../../modules/borg/server.nix
   ];
 
   # Bootloader - standard UEFI setup
@@ -190,14 +191,22 @@
 
   services.tailscale-custom.exitNode = true;
 
-  services.borg-client-custom = {
+  services.borg-server-custom = {
     enable = true;
+    users = {
+      nfss.publicKeys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICp2goZiuSfwMA02GsHhYzUZHrQPPBgP5sWSNP9kQR3e yanlin@imac"
+      ];
+      vps.publicKeys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICp2goZiuSfwMA02GsHhYzUZHrQPPBgP5sWSNP9kQR3e yanlin@imac"
+      ];
+    };
+  };
+
+  services.borg-client-custom = {
+    enable = false;
     repositoryUrl = "ssh://borg-box/./thinkpad";
     backupPaths = [
-      "/home/yanlin/Archive"
-      "/home/yanlin/Credentials"
-      "/home/yanlin/Documents"
-      "/home/yanlin/Media"
     ];
     backupFrequency = "*-*-* 00:00:00";
     retention = {
diff --git a/hosts/nixos/vps/system.nix b/hosts/nixos/vps/system.nix
index 2008bc1..0e473c8 100644
--- a/hosts/nixos/vps/system.nix
+++ b/hosts/nixos/vps/system.nix
@@ -75,7 +75,7 @@
   # Borg backup configuration
   services.borg-client-custom = {
     enable = true;
-    repositoryUrl = "ssh://borg-box/./vps";
+    repositoryUrl = "ssh://vps@thinkpad/./";
     backupPaths = [
       "/var/lib/mongodb"
     ];