diff --git a/.env.sample b/.env.sample
index d4c2aa3..4968940 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,4 +9,12 @@ PUID=1000
 # Filerun
 MYSQL_ROOT_PASSWORD=your_mysql_root_password
 MYSQL_USER=your_filerun_username
-MYSQL_PASSWORD=your_filerun_password
\ No newline at end of file
+MYSQL_PASSWORD=your_filerun_password
+
+# Nextcloud
+NEXTCLOUD_ADMIN_USER=admin
+NEXTCLOUD_ADMIN_PASSWORD=nextcloud_admin_password
+NEXTCLOUD_DB_NAME=nextcloud_db_name
+NEXTCLOUD_DB_USER=nextcloud
+NEXTCLOUD_DB_PASSWORD=nextcloud_db_password
+NEXTCLOUD_DB_ROOT_PASSWORD=nextcloud_db_root_password
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 47efd9d..abc7ff8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -223,11 +223,21 @@ services:
             - web
         volumes:
             - confignextcloud:/config
-            - alldata:/data
+            - nextclouddata:/data
+            - torrents:/torrents
+            - config:/config
         environment:
             - GID=${PGID}
             - UID=${PUID}
             - TZ=Europe/Paris
+            - ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
+            - ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
+            - DOMAIN=nextcloud.${TRAEFIK_DOMAIN}
+            - DB_TYPE=mysql
+            - DB_NAME=${NEXTCLOUD_DB_NAME}
+            - DB_USER=${NEXTCLOUD_DB_USER}
+            - DB_PASSWORD=${NEXTCLOUD_DB_PASSWORD}
+            - DB_HOST=nextcloud-db
         labels:
             - 'traefik.backend=nextcloud'
             - 'traefik.port=8888'
@@ -235,6 +245,21 @@ services:
             - 'traefik.frontend.auth.basic.users=${HTTP_USER}:${HTTP_PASSWORD}'
             - 'traefik.enable=true'
 
+    nextcloud-db:
+        image: mariadb:10
+        restart: always
+        volumes:
+            - nextclouddb:/var/lib/mysql
+        networks:
+            - web
+        environment:
+            MYSQL_ROOT_PASSWORD: ${NEXTCLOUD_DB_ROOT_PASSWORD}
+            MYSQL_USER: ${NEXTCLOUD_DB_USER}
+            MYSQL_PASSWORD: ${NEXTCLOUD_DB_PASSWORD}
+            MYSQL_DATABASE: ${NEXTCLOUD_DB_NAME}
+        labels:
+            - 'traefik.enable=false'
+
     portainer:
         image: portainer/portainer
         restart: always
@@ -292,6 +317,14 @@ volumes:
         driver: local-persist
         driver_opts:
             mountpoint: /data/config/nextcloud
+    nextclouddb:
+        driver: local-persist
+        driver_opts:
+            mountpoint: /data/config/nextcloud-db
+    nextclouddata:
+        driver: local-persist
+        driver_opts:
+            mountpoint: /data/config/nextcloud-data
     torrents:
         driver: local-persist
         driver_opts: