diff --git a/docker-compose.yml b/docker-compose.yml
index 26c3c86..6dd4728 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
       - DRONE_USER_CREATE=username:${DRONE_ADMIN},admin:true
       - DRONE_SERVER_PORT=:80
       - DRONE_DATABASE_DRIVER=postgres
-      - DRONE_DATABASE_DATASOURCE=postgres://postgres:postgres@db:5432/postgres?sslmode=disable
+      - DRONE_DATABASE_DATASOURCE=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?sslmode=disable
       - DRONE_GIT_ALWAYS_AUTH=false
       - DRONE_GITEA_SERVER=https://git.bmen.cc
       - DRONE_RPC_SECRET=§{DRONE_RPC_SECRET}
@@ -75,7 +75,20 @@ services:
       - DRONE_AGENTS_ENABLED=true
     networks:
       - backend-gitea
-    
+
+  drone-db:
+    image: postgres:alpine
+    container_name: drone-db
+    restart: always
+    volumes:
+      - /opt/appdata/gitea/drone-db:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+    networks:
+      - backend-gitea
+
   drone-agent:
     image: drone/agent:1.2.1
     container_name: bmen-gitea-drone-agent