diff --git a/machines/moritz-server/navidrome.nix b/machines/moritz-server/navidrome.nix
index aa2d9bd..d03fb98 100644
--- a/machines/moritz-server/navidrome.nix
+++ b/machines/moritz-server/navidrome.nix
@@ -23,15 +23,15 @@
   };
 
   services.borgbackup.jobs = {
-    mailDirectory = {
+    music = {
       paths = config.services.navidrome.settings.MusicFolder;
-      repo = "u461386-sub1@u461386.your-storagebox.de:musicFolder";
+      repo = "u461386-sub1@u461386.your-storagebox.de:music";
       doInit = true;
       encryption = {
         mode = "repokey";
-        passCommand = "cat ${config.clan.core.vars.generators.borg-navidrome.files.password.path}";
+        passCommand = "cat ${config.clan.core.vars.generators.borg-music.files.password.path}";
       };
-      environment = {BORG_RSH = "ssh -i ${config.clan.core.vars.generators.borg-navidrome.files."ssh.id_ed25519".path} -p 23";};
+      environment = {BORG_RSH = "ssh -i ${config.clan.core.vars.generators.borg-music.files."ssh.id_ed25519".path} -p 23";};
       compression = "auto,zstd";
       startAt = "hourly";
       persistentTimer = true;
@@ -44,7 +44,7 @@
     };
   };
 
-  clan.core.vars.generators.borg-navidrome = {
+  clan.core.vars.generators.borg-music = {
     prompts.password.persist = true;
 
     files."ssh.id_ed25519" = {};
diff --git a/vars/per-machine/moritz-server/borg-music/password/machines/moritz-server b/vars/per-machine/moritz-server/borg-music/password/machines/moritz-server
new file mode 120000
index 0000000..f18ca49
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/password/machines/moritz-server
@@ -0,0 +1 @@
+../../../../../../sops/machines/moritz-server
\ No newline at end of file
diff --git a/vars/per-machine/moritz-server/borg-music/password/secret b/vars/per-machine/moritz-server/borg-music/password/secret
new file mode 100644
index 0000000..efdcd20
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/password/secret
@@ -0,0 +1,19 @@
+{
+	"data": "ENC[AES256_GCM,data:UlYoTPUq2ZnmHQGQRgv6JazL6AnQ3zlt2LCH+3ReuXo=,iv:MTpjKDokWxQP1Boh4/92hf5IO5f20RyyZRb/lKADk0I=,tag:7LbCWNrACgAieaxgKkha4g==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2cU5LOE84UTF2STRMcVZP\nYmpSRVFPbktHOCthRXU2VmVFSG56am8yYlFrClg0a2lmdVlSeEY3QTNDbnJlUXYz\nVENxUnVWTkU5SnFMK09LRlRxNmZMNGcKLS0tIHRJSEdZSmMvZEhIUmVQVFdyNXpR\nS2Z4bXlEZlQzeUZhL1JuVnNrQzNDeVUKwvi6f/zpFgtA0uiQlVzwlDJnu2ZRl7zG\nxiqhK4JYGMoE+xUJQ/tn0QokGKHl3nLCU5QFFT/4EA1QSlp/QkDNYw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoUUhYWTQ2NDdLSnV5SjZR\nR09QWkI4c0dJajFmcStHWlhXcStyZ2VNYWxzCkZoWXVzZjJTUFM1QzZYMlpWcjJG\nMG5CWGdjT29ZalRWaUNYdE4zWkJkT3cKLS0tIGwxNWlXY0ZyRTRQelBmV3dRbjMy\naVU3MVVUN0JaSVY5YUJoemRCV29HYVUKtoCMuMYcx/biciBGZ1S7xr0EmDbVGqvW\niRPdB7utXJXf1QPE1NMKDtNb64zZTjnU+tlvK2O+LuXwpsNhGkY+jg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-06-24T07:01:18Z",
+		"mac": "ENC[AES256_GCM,data:aMJ3sA5DD6jUrUHncuPzs+0NSalN+ljhaZyqqhoEWLtQu3dEc7zY17/bgGeU2s3AnRhTqQZu5F0PZ4hlkeVsJ7kfQgBX25ihrm4bG+Krv8R5YdsGbkNPaN7AlaEaTSqFaPWRCW1Oih+PXIKL6bI6BdncRfX8TGbA2/sFzHWRUHY=,iv:O+etUffn1sCaq3/Izi4dzAPwSIk0GxnkltobBfIyRRY=,tag:BC/hFKlyKXGdcZG8/YRBJw==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.2"
+	}
+}
diff --git a/vars/per-machine/moritz-server/borg-music/password/users/moritz b/vars/per-machine/moritz-server/borg-music/password/users/moritz
new file mode 120000
index 0000000..1b45802
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/password/users/moritz
@@ -0,0 +1 @@
+../../../../../../sops/users/moritz
\ No newline at end of file
diff --git a/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519.pub/value b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519.pub/value
new file mode 100644
index 0000000..f9e2a24
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519.pub/value
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJoG6BY++1BfvzvQx+SuRLB56x7swhUIQq6jqcm9BYbR nixbld@moritz-desktop
diff --git a/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/machines/moritz-server b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/machines/moritz-server
new file mode 120000
index 0000000..f18ca49
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/machines/moritz-server
@@ -0,0 +1 @@
+../../../../../../sops/machines/moritz-server
\ No newline at end of file
diff --git a/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/secret b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/secret
new file mode 100644
index 0000000..a15f2d2
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/secret
@@ -0,0 +1,19 @@
+{
+	"data": "ENC[AES256_GCM,data:f7lqkC7WamYeq0pSGiPRpBOgW6uqLKNW8VqH/pXHMg1JLSoemVOoF2z6xsMuxOj4okWEbofdNVTOvJImCMAISGUGam2qXeD9eJl4wucjJ9U4j3LPSJzt/aA72kKK5XrvPXBpIS6ugJ9DuC+Y192lww2L27Rhpr0Zcdt1hruAS9ZhBk9gliBMh42mJMwhWtujS/WGXf7oZgiNpGfptMzqatHMGvvXzGi05139cCMZorYdwTJCwLu84diyhf+fIdSq9To+iVGTSPKADVL/sXVVxFSFPkB/EmwbEtBvK+jQc90lB6wOMfYCWo4YcUWHsS6UM+M0DURwZDvxC9AkSvUM6oQLMH7vevE81TA4Z/uTe6V00sh+8wmvkOE2YiuD6nv6WCVHfjv63onYAitql/LA8+NyKG65C7awXiyHsHudw8ypDoim6WWJQyiEJnHP6yJL88M5+2TZg8/0KoTnogUxWyCLx27yghVVDLPFdOgBrACHXDdJ6qjdtXuqZqWtu+mIgEBf6nfV8YNQahwPJiUG3mm90RUZ9yCY3108,iv:WaFx2ACugnoxgz+Oj++gPmHiA4XPDVXMTPSH11z8feQ=,tag:Tr93jgUIxDEmEvqK0RpguQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCSnhJRWFKMjhydi9mZHlD\nL2J3YXRhL21zSlBwcjBWVkhRY3dRbzdqUHdZCjYzU2ZtRWorV2tpZ0V4WGtKa2I2\nOU1KRVVHdHN4VU1kUVhwUEdJT2h0UXcKLS0tIE9ST0Z2MXJGcWkybzVGTWhlaStF\nbjYyaWY0S0pSVUZzNjlhLzFnS0UrTk0Kbr6qRh40oHzFsM0/XwzOglRA5Vn3BQTA\n1RgYhD5soo6K9MpmYkt4hZdO54/6qINOo9ikQ15DTB7MNPFhvpxrdg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXZVl0Um9kTURNK2xBdFdH\nNGhuUlRDUk4yWHcxU2lxbUw3NnhETmpXclZRCkdkWUdXbHRqWlhKZEJuSzhobmNZ\nNHhIelkrT3pWazdBSzJaZkZ5YXB4akkKLS0tIDN6QUp2bVZ6SXNaYlRkYnQ2Znoy\nLzhrQ29sME5kellZT3M1ck1LRTJEREEK2ib9GxGYOtOAWfYHOaI9YV/UfOj9HnB3\n35MjrMwnqtsz2dBKW5j4K0TD3xrQ8a+yAGsmP6Q2+X2feglDIOPo2w==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-06-24T07:01:19Z",
+		"mac": "ENC[AES256_GCM,data:pro8QFVsTOpevSmyCQijf8g5pXjb3mO6xMdmwSQcOst508EIry443GhsaaI75qYqebdLEXeAt2BSa4NBi3bZZ/j4VXBgulBNem2H7WLmEb3OKOlYg2Cm+X5pd5jVwii4MtTRgULIYGq04hmp6vUmy9auVyeSL/Q79Vo3jwPGE38=,iv:Qp/hY0gt2qexULOF/+QGwMql+p20TtilR97RKKh2liI=,tag:NKpQXXiYa+dBgFbOCiUDeg==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.2"
+	}
+}
diff --git a/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/users/moritz b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/users/moritz
new file mode 120000
index 0000000..1b45802
--- /dev/null
+++ b/vars/per-machine/moritz-server/borg-music/ssh.id_ed25519/users/moritz
@@ -0,0 +1 @@
+../../../../../../sops/users/moritz
\ No newline at end of file