diff --git a/quadlets/linkwarden/linkwarden-database.container b/quadlets/linkwarden/linkwarden-database.container
index 41a44d3..3ed0f9f 100644
--- a/quadlets/linkwarden/linkwarden-database.container
+++ b/quadlets/linkwarden/linkwarden-database.container
@@ -1,6 +1,6 @@
 [Unit]
 Description=Linkwarden database
-Requires=linkwarden-database.service
+Wants=linkwarden.service
 
 [Service]
 Restart=on-failure
@@ -11,12 +11,10 @@ WantedBy=default.target
 
 [Container]
 Image=docker.io/postgres:16-alpine
-ContainerName=linkwarden
-HostName=linkwarden
+ContainerName=linkwarden-database
+HostName=linkwarden-database
 
 Volume=linkwarden-database:/var/lib/postgresql/data
 
-Environment=DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres
+EnvironmentFile=linkwarden.env
 
-# FIXME: Secret is not injected into env before Environment parses
-Secret=linkwarden-db-pw,type=env,target=POSTGRES_PASSWORD