diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index 28a6efd6..f16072b1 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -1,7 +1,3 @@
-# This file is auto-generated by the Mailu configuration wizard.
-# Please read the documentation before attempting any change.
-# Generated for compose flavor
-
 version: '2.2'
 
 services:
@@ -12,6 +8,16 @@ services:
     restart: always
     volumes:
       - "/mailu/redis:/data"
+  database:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_DATABASE: "mailu"
+      MYSQL_USER: "mailu"
+      MYSQL_PASSWORD: "{{mailu_database_password}}"
+      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+    volumes:
+      - database:/var/lib/mysql
 
   # Core services
   front:
@@ -103,7 +109,8 @@ services:
       - "/mailu/webmail:/data"
     depends_on:
       - imap
-
+volumes:
+  database:
 networks:
   default:
     driver: bridge
diff --git a/roles/docker-mailu/templates/mailu.env.j2 b/roles/docker-mailu/templates/mailu.env.j2
index 8d37267d..5f70f268 100644
--- a/roles/docker-mailu/templates/mailu.env.j2
+++ b/roles/docker-mailu/templates/mailu.env.j2
@@ -139,4 +139,8 @@ LOG_LEVEL=WARNING
 ###################################
 # Database settings
 ###################################
-DB_FLAVOR=sqlite
+DB_FLAVOR=mysql
+DB_USER=mailu
+DB_PW={{mailu_database_password}}
+DB_HOST=database:3306
+DB_NAME=mailu