diff --git a/templates/Nextcloud/0/docker-compose.yml b/templates/Nextcloud/0/docker-compose.yml
index 79ab888..8f208b0 100644
--- a/templates/Nextcloud/0/docker-compose.yml
+++ b/templates/Nextcloud/0/docker-compose.yml
@@ -41,16 +41,13 @@ services:
       {{- end}}
 #      io.rancher.sidekicks: cron
       traefik.enable: true
-      traefik.http.routers.nextcloud-router-http.rule: Host(`${TRAEFIK_HOST}`)
       traefik.http.routers.nextcloud-router-http.entrypoints: http
+      traefik.http.routers.nextcloud-router-http.rule: Host(`${TRAEFIK_HOST}`)
       traefik.http.routers.nextcloud-router-http.middlewares: nextcloud-redirectHttp
       traefik.http.routers.nextcloud-router-http.service: nextcloud-service
-      traefik.http.routers.nextcloud-router-dav.rule: Host(`${TRAEFIK_HOST}`) && Path(`/.well-known/(card|cal)dav`)
-      traefik.http.routers.nextcloud-router-dav.entrypoints: https
-      traefik.http.routers.nextcloud-router-dav.middlewares: nextcloud-redirectDav
-      traefik.http.routers.nextcloud-router-dav.service: nextcloud-service
-      traefik.http.routers.nextcloud-router-https.rule: Host(`${TRAEFIK_HOST}`)
       traefik.http.routers.nextcloud-router-https.entrypoints: https
+      traefik.http.routers.nextcloud-router-https.rule: Host(`${TRAEFIK_HOST}`)
+      traefik.http.routers.nextcloud-router-https.middlewares: nextcloud-redirectDav
       traefik.http.routers.nextcloud-router-https.tls: true
       traefik.http.routers.nextcloud-router-https.tls.certresolver: letsencrypt
       traefik.http.routers.nextcloud-router-https.service: nextcloud-service
@@ -58,8 +55,8 @@ services:
       traefik.http.services.nextcloud-service.loadbalancer.passhostheader: true
       traefik.http.middlewares.nextcloud-redirectHttp.redirectscheme.scheme: https
       traefik.http.middlewares.nextcloud-redirectHttp.redirectscheme.permanent: false # While testing
-      traefik.http.middlewares.nextcloud-redirectDav.redirectregex.regex: https://(.*)/.well-known/(card|cal)dav
-      traefik.http.middlewares.nextcloud-redirectDav.redirectregex.replacement: https://${TRAEFIK_HOST}/remote.php/dav/
+      traefik.http.middlewares.nextcloud-redirectDav.redirectregex.regex: /.well-known/(card|cal)dav
+      traefik.http.middlewares.nextcloud-redirectDav.redirectregex.replacement: /remote.php/dav/
 # Will come back to finish the conversion to Traefik v2 later
 #      ### Start Web UI Segment
 #      traefik.frontend.entryPoints: http,https