diff --git a/docker-compose.yml b/docker-compose.yml
index fe00f8c..17c2e7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,40 +1,30 @@
-version: "3.8"
-
 services:
   bot:
-    build: .
-    container_name: discord-lnbits-bot
+    build:
+      context: .
     env_file:
-      - .env
+      - ./data/secrets/runtime.env
     depends_on:
       - db
-    command: python discord_lnbits_bot.py
-    restart: unless-stopped
 
   web:
-    build: .
-    container_name: discord-lnbits-web
-    env_file:
-      - .env
-    depends_on:
-      - db
-    command: gunicorn -b 0.0.0.0:3000 app:app
+    build:
+      context: .
     ports:
       - "3000:3000"
-    restart: unless-stopped
+    env_file:
+      - ./data/secrets/runtime.env
+    depends_on:
+      - db
 
   db:
     image: postgres:15-alpine
-    container_name: lnbits_db
-    env_file:
-      - .env
     environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASS}
-      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${DB_PASS:-changeme} # fallback
+      POSTGRES_DB: lnbitsdb
     volumes:
-      - postgres_data:/var/lib/postgresql/data
-    restart: unless-stopped
+      - dbdata:/var/lib/postgresql/data
 
 volumes:
-  postgres_data:
+  dbdata: