diff --git a/docker-compose.yml b/docker-compose.yml
index a135b8a0a..dd65674dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -352,7 +352,7 @@ services:
       - ${DEVILBOX_PATH}/cfg/${MYSQL_SERVER}:/etc/mysql/docker-default.d:ro${MOUNT_OPTIONS}
 
       # Mount MySQL Data directory
-      - ${HOST_PATH_MYSQL_DATADIR}/${MYSQL_SERVER}:/var/lib/mysql:rw${MOUNT_OPTIONS}
+      - devilbox-${MYSQL_SERVER:-mariadb-10.1}:/var/lib/mysql:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -389,7 +389,7 @@ services:
       - ${DEVILBOX_PATH}/log/pgsql-${PGSQL_SERVER}:/var/log/postgresql:rw${MOUNT_OPTIONS}
 
       # Mount PostgreSQL Data directory
-      - ${HOST_PATH_PGSQL_DATADIR}/${PGSQL_SERVER}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
+      - devilbox-pgsql-${PGSQL_SERVER:-9.6}:/var/lib/postgresql/data/pgdata:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -478,7 +478,7 @@ services:
       # HOST-DIRECTORY : DOCKER-DIRECTORY
 
       # Mount MongoDB Data directory
-      - ${HOST_PATH_MONGO_DATADIR}/${MONGO_SERVER}:/data/db:rw${MOUNT_OPTIONS}
+      - devilbox-mongo-${MONGO_SERVER:-latest}:/data/db:rw${MOUNT_OPTIONS}
 
     depends_on:
       - bind
@@ -499,3 +499,54 @@ networks:
       config:
         - subnet: 172.16.238.0/24
           gateway: 172.16.238.1
+
+
+################################################################################
+# VOLUMES
+################################################################################
+volumes:
+  # ------------------------------------------------------------
+  # MySQL
+  # ------------------------------------------------------------
+  devilbox-mysql-5.5:
+  devilbox-mysql-5.6:
+  devilbox-mysql-5.7:
+  devilbox-mysql-8.0:
+  devilbox-mariadb-5.5:
+  devilbox-mariadb-10.0:
+  devilbox-mariadb-10.1:
+  devilbox-mariadb-10.2:
+  devilbox-mariadb-10.3:
+  devilbox-percona-5.5:
+  devilbox-percona-5.6:
+  devilbox-percona-5.7:
+
+  # ------------------------------------------------------------
+  # Postgres
+  # ------------------------------------------------------------
+  devilbox-pgsql-9.1:
+  devilbox-pgsql-9.2:
+  devilbox-pgsql-9.3:
+  devilbox-pgsql-9.4:
+  devilbox-pgsql-9.5:
+  devilbox-pgsql-9.6:
+  devilbox-pgsql-10.0:
+  devilbox-pgsql-10.1:
+  devilbox-pgsql-10.2:
+  devilbox-pgsql-10.3:
+  devilbox-pgsql-10.4:
+  devilbox-pgsql-10.5:
+
+  # ------------------------------------------------------------
+  # MongoDB
+  # ------------------------------------------------------------
+  devilbox-mongo-2.8:
+  devilbox-mongo-3.0:
+  devilbox-mongo-3.2:
+  devilbox-mongo-3.4:
+  devilbox-mongo-3.5:
+  devilbox-mongo-3.6:
+  devilbox-mongo-3.7:
+  devilbox-mongo-4.0:
+  devilbox-mongo-4.1:
+  devilbox-mongo-latest: