diff --git a/docker-compose.yml b/docker-compose.yml
index 0c4003a..2c2f546 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,20 +8,31 @@ services:
       - ./data:/data
     environment:
       - BOT_TOKEN=${BOT_TOKEN}
-      - DATABASE_URL=${DATABASE_URL}
+      - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/raboneko}
       - PRIMARY_GUILD_ID=${PRIMARY_GUILD_ID}
       - ANNOUNCEMENTS_CHANNEL_ID=${ANNOUNCEMENTS_CHANNEL_ID}
       - UPDATES_CHANNEL_ID=${UPDATES_CHANNEL_ID}
       - GENERAL_CHANNEL_ID=${GENERAL_CHANNEL_ID}
-      - REDIS_HOST=${REDIS_HOST}
-      - REDIS_PORT=${REDIS_PORT}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PORT=${REDIS_PORT:-6379}
   redis:
     image: redis:latest
     restart: always
     command: redis-server --save 20 1 --loglevel warning
     volumes:
       - redis:/data
+  
+  postgres:
+    image: postgres:latest
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=raboneko
+    volumes:
+      - postgres:/var/lib/postgresql/data
 
 volumes:
   redis:
     driver: local
+  postgres: