diff --git a/docker-compose.yml b/docker-compose.yml
index 16c6ec1..16af31b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,3 +15,36 @@ services:
       - 8080:80
       - 8443:443
     restart: unless-stopped
+
+  zipline-postgres:
+    image: postgres:15
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DATABASE=postgres
+    volumes:
+      - ./appdata/zipline/pg_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U postgres']
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  zipline:
+    image: ghcr.io/diced/zipline
+    ports:
+      - '3000:3000'
+    restart: unless-stopped
+    environment:
+      - CORE_RETURN_HTTPS=false
+      - CORE_SECRET=changethis
+      - CORE_HOST=192.168.1.33
+      - CORE_PORT=3000
+      - CORE_DATABASE_URL=postgres://postgres:postgres@postgres/postgres
+      - CORE_LOGGER=true
+    volumes:
+      - '/mnt/fileserver/files/zipline:/zipline/uploads'
+      - '/mnt/fileserver/files:/zipline/public'
+    depends_on:
+      - 'zipline-postgres'