diff --git a/docker-compose.yml b/docker-compose.yml
index 0edb0f3..544ae96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,38 +1,40 @@
 version: "3.8"
-
 services:
   bot:
     build: .
     container_name: discord-lnbits-bot
     env_file:
-      - ./data/secrets/runtime.env
+      - .env
     depends_on:
-      - db
-    command: python discord_lnbits_bot.py
+      db:
+        condition: service_healthy
     restart: unless-stopped
 
   web:
     build: .
     container_name: discord-lnbits-web
     env_file:
-      - ./data/secrets/runtime.env
+      - .env
+    depends_on:
+      db:
+        condition: service_healthy
     ports:
       - "3000:3000"
-    depends_on:
-      - db
     command: gunicorn -b 0.0.0.0:3000 app:app
     restart: unless-stopped
 
   db:
     image: postgres:15-alpine
     container_name: lnbits_db
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${DB_PASS}
-      POSTGRES_DB: lnbitsdb
+    env_file:
+      - .env
     volumes:
-      - dbdata:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      interval: 10s
+      retries: 5
     restart: unless-stopped
 
 volumes:
-  dbdata:
+  postgres_data: