diff --git a/fstack/lib/nextcloud.sh b/fstack/lib/nextcloud.sh
index c1392d0..b871fec 100644
--- a/fstack/lib/nextcloud.sh
+++ b/fstack/lib/nextcloud.sh
@@ -24,6 +24,24 @@ cat > fstack/nextcloud/docker-compose.yml <<EOF
 version: '3.8'
 
 services:
+  nextcloud_db:
+    image: mariadb:latest
+    container_name: nextcloud_db
+    hostname: nextcloud-db.$DOMAIN
+    domainname: $DOMAIN
+    restart: always
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    networks:
+      fstack:
+        ipv4_address: 172.99.0.19
+    volumes:
+      - ./data/var/lib/mysql:/var/lib/mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=$ADMINPASS
+      - MYSQL_PASSWORD=$ADMINPASS
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+
   nextcloud:
     image: nextcloud:latest
     container_name: nextcloud
@@ -45,9 +63,14 @@ services:
       - VIRTUAL_PROTO=https
       - VIRTUAL_PORT=443
       - VIRTUAL_HOST=nextcloud.$DOMAIN
-      - SQLITE_DATABASE=db1
       - NEXTCLOUD_ADMIN_USER=nextcloud
       - NEXTCLOUD_ADMIN_PASSWORD=$ADMINPASS
+      - MYSQL_PASSWORD=$ADMINPASS
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_HOST=nextcloud_db
+    links:
+      - nextcloud_db
 
 networks:
   fstack:
@@ -98,16 +121,18 @@ cat > fstack/nextcloud/data/root/nextcloud.sh <<EOF
 ADMINUUID=\`./occ user:list | grep admin | awk '{ print \$2 }' | awk -F: '{ print \$1 }'\`
 ./occ group:adduser admin \$ADMINUUID
 ./occ user:delete nextcloud
+./occ app:enable mail
 ./occ app:enable calendar
 ./occ app:enable contacts
 ./occ app:enable notes
-./occ app:enable deck 
-./occ app:enable tasks 
-./occ app:enable bookmarks 
-./occ app:enable forms 
-./occ app:enable appointments 
-./occ app:enable news 
-./occ app:enable spreed 
+./occ app:enable deck
+./occ app:enable tasks
+./occ app:enable bookmarks
+./occ app:enable forms
+./occ app:enable appointments
+./occ app:enable news
+./occ app:enable spreed
+./occ mail:account:create \$ADMINUUID admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password
 EOF
 
 chmod +x fstack/nextcloud/data/root/nextcloud.sh