diff --git a/matermost/docker-compose.yml b/matermost/docker-compose.yml
index f23d6fc..42fdf7d 100644
--- a/matermost/docker-compose.yml
+++ b/matermost/docker-compose.yml
@@ -17,12 +17,12 @@ services:
     depends_on:
       - postgres-server
     volumes:
-      - ${MM_VOLUME_DATA}:/mattermost/data
-      - ${MM_VOLUME_CONFIG}:/mattermost/config
-      - ${MM_VOLUME_CLIENT_PLUGINS}:/mattermost/client/plugins
-      - ${MM_VOLUME_PLUGINS}:/mattermost/plugins
-      - ${MM_VOLUME_BLEVE_INDEXES}:/mattermost/bleveindexes
-      - ${MM_VOLUME_LOGS}:/mattermost/logs
+      - ${MM_VOLUME}/data:/mattermost/data
+      - ${MM_VOLUME}/config:/mattermost/config
+      - ${MM_VOLUME}/client/plugins:/mattermost/client/plugins
+      - ${MM_VOLUME}/plugins:/mattermost/plugins
+      - ${MM_VOLUME}/bleveindexes:/mattermost/bleveindexes
+      - ${MM_VOLUME}/logs:/mattermost/logs
     restart: always
     extra_hosts:
       - "${MM_EXTERNAL_HOST}"
@@ -34,5 +34,5 @@ services:
       - POSTGRES_USER="${MM_POSTGRES_USER}"
       - POSTGRES_PASSWORD="${MM_POSTGRES_PASSWORD}"
     volumes:
-      - ${MM_VOLUME_POSTGRES}:/var/lib/postgresql/data
+      - ${MM_VOLUME}/db:/var/lib/postgresql/data
     restart: always
\ No newline at end of file