diff --git a/vars/per-machine/moritz-server/mail-server/main-password-hash/machines/moritz-server b/vars/per-machine/moritz-server/mail-server/main-password-hash/machines/moritz-server
new file mode 120000
index 0000000..f18ca49
--- /dev/null
+++ b/vars/per-machine/moritz-server/mail-server/main-password-hash/machines/moritz-server
@@ -0,0 +1 @@
+../../../../../../sops/machines/moritz-server
\ No newline at end of file
diff --git a/vars/per-machine/moritz-server/mail-server/main-password-hash/secret b/vars/per-machine/moritz-server/mail-server/main-password-hash/secret
new file mode 100644
index 0000000..9817c3d
--- /dev/null
+++ b/vars/per-machine/moritz-server/mail-server/main-password-hash/secret
@@ -0,0 +1,19 @@
+{
+	"data": "ENC[AES256_GCM,data:vUQpItSZ0PCFbvG7+dPN0t7BIU7hWNxSZBWRBXXDnoV/X4H7Pii6v2evk1p2v6nKbDLlFmrYmipGvDwqU7x5i4aYUfL4XLythfZ8/H8ZjqQsa58jr/L9BqPEyngdKp959NHvBbzBYEO7+Q==,iv:yYpORYLxp4Cniq3MARN4UvQGqq/OVO9drIDJ//IItgg=,tag:q2MXgoPHpYqR3S7hyVHarQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYdFF3dHR5RXgwRlBvbHBy\naW5OaVFXYjlsemlycSs5RlpyZjgrcDkweFNvCmhiOU1uRkZnK3pveTYvajlXbmha\na0JRdEl1TjFtc1BOcUF4c1U4am1sTEkKLS0tIE1tb2RRZTZpYW15b3JIR3hycGJD\naE5DOE9NM01mOGhSRUN1RmlnRy9nb2MKKIRwt/N0YDzxvzgTkrEsWgvagZHKmvt2\npU7gYJyS/p192SxcKELffJ4ycbGBNDt8mibFkdFayc07c0zoJ/tgbQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwTG90SUhKdkJxenUveDdS\nbE1KZTQvL1dzcEtXeWhBL3FDSGpSYUVSRWxBCjMxU0M3VmtUc1NrT1A5NEorb2lK\nbG1vRjZDMEl0TGlPaFVWZmVLWGtWRXMKLS0tIGxoc280R3dmd01qbUMxeGozMHE3\ndE5BS2VOVFhsaFExaDdpcGVMYUZ0Y2sKuFdgKS0dftMHAK3cmtG2n4D4eM+bLfCm\no0gxVOwx5EktRJh6r+Ph39X+6OfJ7TXWGsxqRyqcvwr+r0tZNozNZw==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-05-14T14:16:23Z",
+		"mac": "ENC[AES256_GCM,data:9f+LQUfxdDl6KoYGYlmdSc3yvHTMsltMe7z/KCmPztKNnoPhvGjezejMsbFWtBRaEZxBAd0PlKDZCg7+JJEotQtqgcOPJChlEJRUYaJlOcrl9zK8C0JmWZwydPWu5Pzy5/cmRiRQIuDR9A8Zbj7tFEdegGR6Mg9OPehSTOrA1PQ=,iv:7Vvs+0e691Najwh4paUBSkMaYDhl6otFAXr56FzESMo=,tag:6MJwZHNZuz+oM3cKyetFYg==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.1"
+	}
+}
diff --git a/vars/per-machine/moritz-server/mail-server/main-password-hash/users/moritz b/vars/per-machine/moritz-server/mail-server/main-password-hash/users/moritz
new file mode 120000
index 0000000..1b45802
--- /dev/null
+++ b/vars/per-machine/moritz-server/mail-server/main-password-hash/users/moritz
@@ -0,0 +1 @@
+../../../../../../sops/users/moritz
\ No newline at end of file
diff --git a/vars/per-machine/moritz-server/mail-server/main-password/secret b/vars/per-machine/moritz-server/mail-server/main-password/secret
index ee589ab..6a271dc 100644
--- a/vars/per-machine/moritz-server/mail-server/main-password/secret
+++ b/vars/per-machine/moritz-server/mail-server/main-password/secret
@@ -1,14 +1,14 @@
 {
-	"data": "ENC[AES256_GCM,data:5oAUAp4PErA9oUhWjH6MVij1kee75gA1IM7lfGJkZso=,iv:YkT3bbDPIKbj4QFFQmBdkAlYQzoJJDP78mkMx3a78rk=,tag:w0y/YHvHFPwYweQrDW3raQ==,type:str]",
+	"data": "ENC[AES256_GCM,data:AkZ88cgYhjHlNfiHkRBhWOznbtEAKPjvHcpN8Y5bhbM=,iv:pzQjlxc8sMkprvYWhEEXHqkJQZjAQ8U2Y5fIh0ft2sA=,tag:3CU2YJGVPe4tayMJ8U9nLQ==,type:str]",
 	"sops": {
 		"age": [
 			{
 				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqcFBRZnR0aE1xcjlSWjlx\nWTl1TWUzMXk5SmhPN29hcGg1WkV1VXRDTGpvCmZwZlpCUGloL1FuRFVKVnJ1Z1VW\nYzNDZFVzNlk2NjM3UkxyanBIY3FxanMKLS0tIG5zN0o4YlgwaE9CRWRMY2E0cmJF\ndGJvS0EwQUM0bSt3SFRuTjhwYm1XSDgKRR6tZNK/INrIIZyCsyXYp5Ss9JJnw8PT\nP0qWCB8WDW7K7eOL8LjlcIAVNdxvhbWX+rq6vG9xEORFXc7fgg9UBw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBUEhJdTRDcXlIRE4rREc1\nMnJZc1dBSjZwVVhSSWs1MzJIbkE3a1NoK2hFCjlOWnZhVUI0V1BSWnVoOVZ4Rndj\nQzhBcVl6SGhoak9lQWZTN2c5b2doMjgKLS0tIFB3ZXYydVVBZWVVbTUrTkgwR0o0\nQkhGWlZFc2JWVkpvZGhTUVFQVU9DMHcKvQkOm044Aro20YXKCQ0XMDJy9wfa4Zev\nh3toOumU+Du9+4SvItWyKV8RpRfXHGVGwpdDyvDyR9vdkNehu/4AIg==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-05-14T14:10:21Z",
-		"mac": "ENC[AES256_GCM,data:zWC5iZDyW0bPpMhuqkj+31Rijp2ibeUbLPPgXeOygMpJy+8vix2BvzWXInKCobCVGXMw8PGMSJFFimBCTA/qxFGzLpnfMpPU8+e/0NlaaGKdsi8G7V972Uq0+1p2pJ0lz4TTp2FEfdFbcQVJOI74XE8X5cWvY71tPiZprZ2Jw6Q=,iv:O7R0aAnQbIg0LI11vFy5edu2gkq/ID2VJ9KycxUtEEc=,tag:Ckl7HxAHqAVyYKv9L74p0g==,type:str]",
+		"lastmodified": "2025-05-14T14:16:22Z",
+		"mac": "ENC[AES256_GCM,data:ttVVdprPzuwOic9GryqMpYx3SdEk27vdBxkOy/wwiVcJiuUABCC2fwk0MTP/mjmtYLXW/KEwX9Pvyex4SnYJ9v7HzrgvxoR7fW2S9uTXAnAu+wau5GZ8vywZu6SnzOWon6r5DGJXdHHPTXPeo09YgwDNjfSlwaFLlm10Mo5yQKU=,iv:kvsiEtVYEg6yWqRblo/1sjXaU5PRGRde1aCwMy487Wk=,tag:FmWIAVM2DVHDNVzlKNfRXg==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.10.1"
 	}