diff --git a/containers/nextcloud/tasks.yml b/containers/nextcloud/tasks.yml
index e6f5a55..28e6107 100644
--- a/containers/nextcloud/tasks.yml
+++ b/containers/nextcloud/tasks.yml
@@ -77,6 +77,7 @@
         - traefik-nextcloud
         - mariadb-nextcloud
         - redis-nextcloud
+        - nextcloud-collabora
 
     - name: Create redis instance
       become_user: containers
@@ -139,6 +140,7 @@
           - traefik-nextcloud
           - mariadb-nextcloud
           - redis-nextcloud
+          - nextcloud-collabora
         label:
           io.containers.autoupdate: "registry"
           traefik.enable: "true"
@@ -170,7 +172,7 @@
           SMTP_AUTHTYPE: "None"
           SMTP_NAME: ""
           SMTP_PASSWORD: ""
-          MAIL_FROM_ADDRESS: "nextcloud"
+          MAIL_FROM_ADDRESS: "{{ vault_smtp_from }}"
           MAIL_DOMAIN: "{{ vault_smtp_domain }}"
           TRUSTED_PROXIES: "traefik"
           OVERWRITEWEBROOT: "/cloud"