diff --git a/systems/x86_64-linux/marvin/services/secrets/buildbot-gitea-token.age b/systems/x86_64-linux/marvin/services/secrets/buildbot/gitea-token.age
similarity index 100%
rename from systems/x86_64-linux/marvin/services/secrets/buildbot-gitea-token.age
rename to systems/x86_64-linux/marvin/services/secrets/buildbot/gitea-token.age
diff --git a/systems/x86_64-linux/marvin/services/secrets/buildbot-oauth-secret.age b/systems/x86_64-linux/marvin/services/secrets/buildbot/oauth-secret.age
similarity index 100%
rename from systems/x86_64-linux/marvin/services/secrets/buildbot-oauth-secret.age
rename to systems/x86_64-linux/marvin/services/secrets/buildbot/oauth-secret.age
diff --git a/systems/x86_64-linux/marvin/services/secrets/buildbot-worker-password.age b/systems/x86_64-linux/marvin/services/secrets/buildbot/worker-password.age
similarity index 100%
rename from systems/x86_64-linux/marvin/services/secrets/buildbot-worker-password.age
rename to systems/x86_64-linux/marvin/services/secrets/buildbot/worker-password.age
diff --git a/systems/x86_64-linux/marvin/services/secrets/buildbot-workers.age b/systems/x86_64-linux/marvin/services/secrets/buildbot/workers.age
similarity index 100%
rename from systems/x86_64-linux/marvin/services/secrets/buildbot-workers.age
rename to systems/x86_64-linux/marvin/services/secrets/buildbot/workers.age
diff --git a/systems/x86_64-linux/marvin/services/secrets/secrets.nix b/systems/x86_64-linux/marvin/services/secrets/secrets.nix
index 055ed319..242660d8 100644
--- a/systems/x86_64-linux/marvin/services/secrets/secrets.nix
+++ b/systems/x86_64-linux/marvin/services/secrets/secrets.nix
@@ -11,10 +11,10 @@ in
 {
   "anubis-key.age".publicKeys = marvinDefault;
   "authentik-env.age".publicKeys = marvinDefault;
-  "buildbot-worker-password.age".publicKeys = marvinDefault;
-  "buildbot-gitea-token.age".publicKeys = marvinDefault;
-  "buildbot-oauth-secret.age".publicKeys = marvinDefault;
-  "buildbot-workers.age".publicKeys = marvinDefault;
+  "buildbot/gitea-token.age".publicKeys = marvinDefault;
+  "buildbot/oauth-secret.age".publicKeys = marvinDefault;
+  "buildbot/worker-password.age".publicKeys = marvinDefault;
+  "buildbot/workers.age".publicKeys = marvinDefault;
   "forgejo/aux-docs-runner-token.age".publicKeys = marvinDefault;
   "forgejo/db-pw.age".publicKeys = marvinDefault;
   "forgejo/default-runner-token.age".publicKeys = marvinDefault;