diff --git a/docker-compose.yml b/docker-compose.yml
index ca5fb85..8cceb81 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,8 @@ services:
   inventaire:
     image: inventaire/inventaire:latest
     env_file: .env
+    environment:
+      - 'INVENTAIRE_PORT=${INVENTAIRE_PORT:-3016}'
     # You may also build image from sources with:
     # build:
       # context: ./inventaire
@@ -26,6 +28,8 @@ services:
       dockerfile: Dockerfile.couchdb
     env_file: .env
     environment:
+      - 'COUCHDB_USER=${COUCHDB_USER:-couchdb}'
+      - 'COUCHDB_PASSWORD=${COUCHDB_PASSWORD:-change_this_password_now}'
       # See https://docs.couchdb.org/en/stable/maintenance/performance.html#disk-and-file-system-performance
       - 'ERL_FLAGS=+A 4'
     # Uncomment ports to get access to the db