diff --git a/modules/server/database/default.nix b/modules/server/database/default.nix
index fe293c1..72b6272 100644
--- a/modules/server/database/default.nix
+++ b/modules/server/database/default.nix
@@ -1,14 +1,10 @@
 
 { config, lib, pkgs, ... }:
 let
+
   listNames = config.syscfg.server.db;
-
-  containerNames = lib.mapAttrsToList 
-    (name: cfg: name) 
-    (lib.filterAttrs (name: cfg: cfg.db or false) config.syscfg.server.containers);
-
+  containerNames = builtins.attrNames (lib.filterAttrs (appName: app: app.db) config.syscfg.server.loadedContainers);
   allApps = lib.unique (listNames ++ containerNames);
-
 in {
   config = lib.mkIf ( builtins.length allApps > 0) {
     services.postgresql = {