diff --git a/docker-mailserver/docker-compose.yml b/docker-mailserver/docker-compose.yml
index 973932e..65792b0 100644
--- a/docker-mailserver/docker-compose.yml
+++ b/docker-mailserver/docker-compose.yml
@@ -14,11 +14,11 @@ services:
       - "993:993"
     volumes:
       - ../rainloop/letsencrypt/acme.json:/etc/letsencrypt/acme.json:ro
-      - mail/maildata:/var/mail
-      - mail/mailstate:/var/mail-state
-      - mail/sa-learn:/etc/cron.d/sa-learn
-      - mail/maillogs:/var/log/mail
-      - mail/config/:/tmp/docker-mailserver/
+      - maildata:/var/mail
+      - mailstate:/var/mail-state
+      - ./sa-learn:/etc/cron.d/sa-learn
+      - maillogs:/var/log/mail
+      - config/:/tmp/docker-mailserver/
       - /etc/localtime:/etc/localtime:ro
     restart: unless-stopped
     cap_add: ["NET_ADMIN", "SYS_PTRACE"]
@@ -33,8 +33,23 @@ services:
       - "traefik.http.routers.whoami.middlewares=default-headers@file"
 
 volumes:
-  mail:
+  maildata:
     driver_opts:
       type: "nfs"
       o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
-      device: ":/server_data/mail"
+      device: ":/server_data/docker-mailserver/maildata"
+  mailstate:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
+      device: ":/server_data/docker-mailserver/mailstate"
+  maillogs:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
+      device: ":/server_data/docker-mailserver/maillogs"
+  config:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.7.89.108,nolock,hard,rw,vers=4.1"
+      device: ":/server_data/docker-mailserver/config"