diff --git a/containers/nextcloud/tasks.yml b/containers/nextcloud/tasks.yml
index 7bbf3af..e6f5a55 100644
--- a/containers/nextcloud/tasks.yml
+++ b/containers/nextcloud/tasks.yml
@@ -82,7 +82,7 @@
       become_user: containers
       become: true
       containers.podman.podman_container:
-        name: redis
+        name: redis_nextcloud
         image: docker.io/redis:latest
         state: present
         volume:
@@ -147,16 +147,17 @@
           traefik.http.routers.nextcloud.tls: "true"
           traefik.http.routers.nextcloud.tls.certresolver: "wildcard"
           traefik.http.routers.nextcloud.service: "nextcloud"
-          traefik.http.routers.nextcloud.middlewares: "nextcloud-redirectregex,nextcloud-headers,http-compress@file"
+          traefik.http.routers.nextcloud.middlewares: "nextcloud-prefixstrip,nextcloud-redirectregex,nextcloud-headers,http-compress@file"
           traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.permanent: "true"
           traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.regex: "https://(.*)/cloud/.well-known/(card|cal)dav"
           traefik.http.middlewares.nextcloud-redirectregex.redirectRegex.replacement: "https://${1}/cloud/remote.php/dav/"
           traefik.http.middlewares.nextcloud-headers.headers.stsSeconds: "31536000"
           traefik.http.middlewares.nextcloud-headers.headers.stsIncludeSubdomains: "true"
+          traefik.http.middlewares.nextcloud-prefixstrip.stripprefix.prefixes: "/cloud"
           traefik.http.services.nextcloud.loadbalancer.server.port: "80"
           traefik.docker.network: "traefik-nextcloud"
         env:
-          REDIS_HOST: "redis"
+          REDIS_HOST: "redis_nextcloud"
           REDIS_PORT: "6379"
           MYSQL_DATABASE: "{{ vault_nextcloud_mariadb_database }}"
           MYSQL_USER: "{{ vault_nextcloud_mariadb_user }}"
@@ -166,12 +167,13 @@
           SMTP_HOST: "{{ vault_smtp_host }}"
           SMTP_SECURE: "{{ vault_smtp_protocol }}"
           SMTP_PORT: "{{ vault_smtp_port }}"
-          SMTP_AUTHTYPE: "LOGIN"
-          SMTP_NAME: "{{ vault_smtp_user }}"
-          SMTP_PASSWORD: "{{ vault_smtp_password }}"
+          SMTP_AUTHTYPE: "None"
+          SMTP_NAME: ""
+          SMTP_PASSWORD: ""
           MAIL_FROM_ADDRESS: "nextcloud"
           MAIL_DOMAIN: "{{ vault_smtp_domain }}"
           TRUSTED_PROXIES: "traefik"
+          OVERWRITEWEBROOT: "/cloud"
         generate_systemd:
           path: /home/containers/.config/systemd/user/
           restart_policy: on-failure
@@ -189,7 +191,7 @@
         daemon_reload: true
       loop:
         - nextcloud
-        - redis
+        - redis_nextcloud
         - db_nextcloud
 
     - name: Enable a timer unit