diff --git a/mail/docker-compose.yml b/mail/docker-compose.yml
index 3e31a3b..ee96b5f 100644
--- a/mail/docker-compose.yml
+++ b/mail/docker-compose.yml
@@ -32,6 +32,8 @@ services:
     env_file:
       - .env
       - env-roundcube
+    volumes:
+      - rb_db:/var/lib/postgresql/data/
     networks:
       - internal
 
@@ -44,6 +46,8 @@ services:
     env_file:
       - .env
       - env-roundcube
+    volumes:
+      - rb_config:/var/roundcube/config/
     networks:
       - proxy
       - internal
@@ -67,6 +71,18 @@ volumes:
       type: none
       o: bind
       device: "/srv/docker/mail/logs"
+  rb_config:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: "/srv/docker/mail/roundcube-config"
+  rb_db:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: "/srv/docker/mail/roundcube-db"
   nginx_cert:
     driver: local
     driver_opts: