diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..19978310
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,3 @@
+DB_USER=
+DB_PASSWORD=
+DB_NAME=
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 9e37fa62..fb0e3d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ server/views/setup.pug
 
 # Config Files
 /config.yml
+.env
 
 # Data directories
 /repo
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..194f9563
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,32 @@
+services:
+  db:
+    container_name: wiki-db
+    image: postgres:17-alpine
+    environment:
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USER}
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    restart: unless-stopped
+
+  wiki:
+    container_name: wiki-app
+    image: ghcr.io/requarks/wiki:2
+    init: true
+    depends_on:
+      - db
+    environment:
+      DB_TYPE: postgres
+      DB_HOST: db
+      DB_PORT: 5432
+      DB_USER: ${DB_USER}
+      DB_PASS: ${DB_PASSWORD}
+      DB_NAME: ${DB_NAME}
+      DB_SSL: ${DB_SSL:-false}
+    ports:
+      - "3000:3000"
+    restart: unless-stopped
+
+volumes:
+  db-data: