diff --git a/vaultwarden/docker-compose.postgres.yml b/vaultwarden/docker-compose.postgres.yml
index 49fc448..58e2bf7 100644
--- a/vaultwarden/docker-compose.postgres.yml
+++ b/vaultwarden/docker-compose.postgres.yml
@@ -4,5 +4,7 @@ version: "3.8"
 
 services:
   vaultwarden:
+    depends_on:
+      - postgres
     environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB}
\ No newline at end of file
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB}
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 288e328..c2ca4a1 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -9,10 +9,8 @@ volumes:
 services:
   vaultwarden:
     image:  ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine}
-    container_name: vaultwarden
+    container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
     restart: always
-    depends_on:
-      - postgres
     environment:
       ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err}
       DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}