diff --git a/docker-compose.yml b/docker-compose.yml
index 1029fcc40b2fad43eedce220e8e1bed75eb8ca3c..b10f086e1528f713adf33e96648416c158590cf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,29 @@
-version: '3'
+version: '3.2'
 
 services:
-
-  modjular-piwigo:
-    build: .
+  app:
     image: modjular/modjular-piwigo:latest
+    build: .
     ports:
-      - 80:80
-      - 9443:443
+      - "80"
     volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - piwig-conf:/config
+      - pictures:/pictures
+      - log:/config/log
+      - galleries:/config/www/gallery/galleries
+      - data:/config/www/gallery/_data
+      - upload:/config/www/gallery/upload
+      - plugins:/config/www/gallery/plugins
+      - themes:/config/www/gallery/themes
+      - template-extension:/config/www/gallery/template-extension
+      - local:/config/www/gallery/local
 
 volumes:
-  piwig-conf:
+  pictures:
+  log:
+  galleries:
+  data:
+  upload:
+  plugins:
+  themes:
+  template-extension:
+  local: