diff --git a/docker-compose.yml b/docker-compose.yml
index 17c2e7b..0edb0f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,30 +1,38 @@
+version: "3.8"
+
 services:
   bot:
-    build:
-      context: .
+    build: .
+    container_name: discord-lnbits-bot
     env_file:
       - ./data/secrets/runtime.env
     depends_on:
       - db
+    command: python discord_lnbits_bot.py
+    restart: unless-stopped
 
   web:
-    build:
-      context: .
-    ports:
-      - "3000:3000"
+    build: .
+    container_name: discord-lnbits-web
     env_file:
       - ./data/secrets/runtime.env
+    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:-changeme} # fallback
+      POSTGRES_PASSWORD: ${DB_PASS}
       POSTGRES_DB: lnbitsdb
     volumes:
       - dbdata:/var/lib/postgresql/data
+    restart: unless-stopped
 
 volumes:
   dbdata: