diff --git a/README.md b/README.md
index eb96722..cdd4fc7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # ❄️ puter
 
-This is my NixOS configuration. There are many like it, but this one is mine. Copy at your own risk.
+This is my cobbled together NixOS configuration. There are many like it, but this one is mine. Copy at your own risk.
diff --git a/flake.nix b/flake.nix
index 9da3b1a..69040b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,12 +34,14 @@
                 ({lib, ...}: {networking.hostName = lib.mkDefault name;})
               ];
             };
+
+          genHosts = (nixpkgs.lib.pipe (builtins.readDir ./hosts) [
+            (nixpkgs.lib.filterAttrs (name: type: type == "directory" && name != "default.nix"))
+            builtins.attrNames
+            nixpkgs.lib.genAttrs
+          ]);
         in
-          nixpkgs.lib.genAttrs [
-            "abacus"
-            "vessel"
-          ]
-          commonNixosSystem;
+          genHosts commonNixosSystem;
       };
 
       perSystem = {
diff --git a/hosts/abacus/miniflux.nix b/hosts/abacus/miniflux.nix
index 163e201..e85eb21 100644
--- a/hosts/abacus/miniflux.nix
+++ b/hosts/abacus/miniflux.nix
@@ -2,11 +2,7 @@
   inherit (config.networking) domain;
   virtualHostName = "flux.${domain}";
 in {
-  age.secrets.miniflux = {
-    file = ../../secrets/miniflux.age;
-    # owner = config.systemd.services.miniflux.serviceConfig.User;
-    # group = "root";
-  };
+  age.secrets.miniflux.file = ../../secrets/miniflux.age;
 
   services.miniflux = {
     enable = true;
diff --git a/hosts/abacus/vaultwarden.nix b/hosts/abacus/vaultwarden.nix
index bcaa49e..7c7c96c 100644
--- a/hosts/abacus/vaultwarden.nix
+++ b/hosts/abacus/vaultwarden.nix
@@ -3,11 +3,7 @@
   virtualHostName = "vault.${domain}";
   backupDir = "/srv/backup/vaultwarden";
 in {
-  age.secrets.vaultwarden = {
-    file = ../../secrets/vaultwarden.age;
-    owner = config.systemd.services.vaultwarden.serviceConfig.User;
-    group = config.systemd.services.vaultwarden.serviceConfig.Group;
-  };
+  age.secrets.vaultwarden.file = ../../secrets/vaultwarden.age;
 
   services.vaultwarden = {
     enable = true;
diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age
index a061439..7934c30 100644
Binary files a/secrets/vaultwarden.age and b/secrets/vaultwarden.age differ