diff --git a/.gitignore b/.gitignore
index 121d62b..d039141 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 !hosts/cube/
 !hosts/cube/forgejo/
 !hosts/cube/grafana/
+!hosts/cube/mail/
 !hosts/cube/matrix/
 !hosts/cube/nextcloud/
 !hosts/cube/restic/
diff --git a/hosts/cube/forgejo/default.nix b/hosts/cube/forgejo/default.nix
index 70ba486..aff2df2 100644
--- a/hosts/cube/forgejo/default.nix
+++ b/hosts/cube/forgejo/default.nix
@@ -8,7 +8,7 @@ let
   port = 8004;
 in systemConfiguration {
   secrets.forgejoMailPassword = {
-    file  = ../password.plain.mail.age;
+    file  = ../mail/password.plain.age;
     owner = "forgejo";
   };
   secrets.forgejoRunnerPassword = {
diff --git a/hosts/cube/grafana/default.nix b/hosts/cube/grafana/default.nix
index 1ff6c66..750ebb7 100644
--- a/hosts/cube/grafana/default.nix
+++ b/hosts/cube/grafana/default.nix
@@ -12,7 +12,7 @@ in systemConfiguration {
     owner = "grafana";
   };
   secrets.grafanaMailPassword = {
-    file  = ../password.plain.mail.age;
+    file  = ../mail/password.plain.age;
     owner = "grafana";
   };
 
diff --git a/hosts/cube/mail.nix b/hosts/cube/mail/default.nix
similarity index 96%
rename from hosts/cube/mail.nix
rename to hosts/cube/mail/default.nix
index 2d764b8..f49e23c 100644
--- a/hosts/cube/mail.nix
+++ b/hosts/cube/mail/default.nix
@@ -7,7 +7,7 @@ let
 
   prometheusPort = 9040;
 in systemConfiguration {
-  secrets.mailPassword.file = ./password.plain.mail.age;
+  secrets.mailPassword.file = ./password.plain.age;
 
   services.prometheus = {
     exporters.postfix = enabled {
diff --git a/hosts/cube/password.hash.mail.age b/hosts/cube/mail/password.hash.age
similarity index 100%
rename from hosts/cube/password.hash.mail.age
rename to hosts/cube/mail/password.hash.age
diff --git a/hosts/cube/password.plain.mail.age b/hosts/cube/mail/password.plain.age
similarity index 100%
rename from hosts/cube/password.plain.mail.age
rename to hosts/cube/mail/password.plain.age
diff --git a/secrets.nix b/secrets.nix
index afb2765..b5f2ea8 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -5,8 +5,8 @@ in with keys; {
   "hosts/cube/id.age".publicKeys           = [ cube enka ];
   "hosts/cube/password.rgb.age".publicKeys = [ cube enka ];
 
-  "hosts/cube/password.plain.mail.age".publicKeys = [ cube enka ];
-  "hosts/cube/password.hash.mail.age".publicKeys  = [ cube enka ];
+  "hosts/cube/mail/password.plain.age".publicKeys = [ cube enka ];
+  "hosts/cube/mail/password.hash.age".publicKeys  = [ cube enka ];
 
   "hosts/cube/forgejo/password.runner.age".publicKeys = [ cube enka ];