diff --git a/.gitignore b/.gitignore
index eab96a8..0fa5bef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ db-password.txt
 kontor-api/tests/test_main.py
 kontor-api/tests/test_db.db
 kontor-api/test_db.db
+couchdb-password.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index 578a187..97919e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,21 @@ services:
     networks:
       - database
       - frontend
+  couchdb:
+    image: couchdb
+    restart: unless-stopped
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
+    ports:
+      - 5984:5984
+    networks:
+      - database
+      - frontend
+    volumes:
+      - couchdb-data:/opt/couchdb/data
+    secrets:
+      - couchdb-password
   kontor:
     image: kontor:0.2.0-SNAPSHOT
     restart: unless-stopped
@@ -59,8 +74,11 @@ networks:
   frontend:
 volumes:
   postgres-data:
+  couchdb-data:
   images-data:
 secrets:
   db-password:
     file: db-password.txt
+  couchdb-password:
+    file: couchdb-password.txt