diff --git a/bundles/postgresql/items.py b/bundles/postgresql/items.py
index 48b67b4..6c475b7 100644
--- a/bundles/postgresql/items.py
+++ b/bundles/postgresql/items.py
@@ -29,6 +29,7 @@ directories = {
         'owner': 'postgres',
         'group': 'postgres',
         'mode': '0755',
+        'needs': {f'pkg_apt:{i}' for i in pkg_apt.keys()},
     },
 }
 
@@ -105,10 +106,4 @@ for user, config in node.metadata.get('postgresql/roles', {}).items():
     }
 
 for database, config in node.metadata.get('postgresql/databases', {}).items():
-    postgres_dbs[database] = {
-        'owner': config['owner'],
-        'needs': {
-            'postgres_role:',
-            'svc_systemd:postgresql',
-        },
-    }
+    postgres_dbs[database] = config