diff --git a/docker-compose.yml b/docker-compose.yml
index ba3775ee..e2dcda17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
   php-fpm:
     build: docker/php-fpm
@@ -57,7 +56,9 @@ services:
   baikal:
     image: ckulka/baikal:0.9.4-apache
     ports:
-      - "9000:80"
+      - "8100:80"
     volumes:
-      - ./docker/baikal:/var/www/baikal
-  
+      - ./docker/baikal:/var/www/html
+      - ./docker/baikal/config:/var/www/baikal/config
+      - ./docker/baikal/data:/var/www/baikal/Specific
+
diff --git a/docs/docker.md b/docs/docker.md
index d9baadf0..debdccc0 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -39,6 +39,8 @@ In the host machine the server is accessible from `http://localhost` and the dat
 
 You can additionally access phpMyAdmin from `http://localhost:8080` (credentials are `root` / `secret`) and Mailpit from `http://localhost:8025`.
 
+Baikal, a self-hosted CalDAV server used to develop the CalDAV syncing integration is available on `http://localhost:8100`. 
+
 **Attention:** This configuration is meant to make development easier. It is not intended to server as a production environment!
 
 A production image of Easy!Appointments can be found at: https://github.com/alextselegidis/easyappointments-docker