diff --git a/hosts/nixos/hs/system.nix b/hosts/nixos/hs/system.nix
index 10c3953..bd95fa8 100644
--- a/hosts/nixos/hs/system.nix
+++ b/hosts/nixos/hs/system.nix
@@ -217,32 +217,6 @@
     showBorgStatus = true;
   };
 
-  # Borg backup configuration
-  services.borg-client-custom = {
-    enable = true;
-    repositoryUrl = "ssh://hs@borg-thinkpad/./hs";
-    backupPaths = [
-      "/mnt/storage/appbulk/immich/library/"
-      "/mnt/storage/Media/DCIM"
-      "/mnt/storage/Media/nsfw"
-    ];
-    backupFrequency = "*-*-* 00:00:00";
-    retention = {
-      keepDaily = 7;
-      keepWeekly = 4;
-      keepMonthly = 6;
-      keepYearly = 2;
-    };
-    passphraseFile = "/etc/borg-passphrase";
-
-    preHook = ''
-      echo "$(date): Starting Borg backup of ${config.networking.hostName}"
-    '';
-    postHook = ''
-      echo "$(date): Borg backup of ${config.networking.hostName} completed successfully"
-    '';
-  };
-
   services.tailscale-custom = {
     exitNode = true;
     subnetRoutes = [ "10.1.1.0/24" ];
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index 92ec9e6..779a8e7 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -244,14 +244,4 @@
     showDiskUsage = true;
   };
 
-  services.borg-server-custom = {
-    enable = true;
-    dataDir = "/srv/borg";
-    users = {
-      hs = {
-        publicKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICp2goZiuSfwMA02GsHhYzUZHrQPPBgP5sWSNP9kQR3e yanlin@imac" ];
-      };
-    };
-  };
-
 }
diff --git a/modules/ssh.nix b/modules/ssh.nix
index 1c9ce73..a6efdab 100644
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@@ -54,18 +54,6 @@
         identityFile = "~/Credentials/ssh_keys/hetzner";
       };
 
-      "borg-box" = {
-        hostname = "u501367.your-storagebox.de";
-        user = "u501367";
-        port = 23;
-        identityFile = "~/Credentials/ssh_keys/hetzner";
-      };
-
-      "borg-thinkpad" = {
-        hostname = "vpn.thinkpad.yanlincs.com";
-        identityFile = "~/Credentials/ssh_keys/thinkpad";
-      };
-
     };
   };
 }